diff --git a/ChangeLog b/ChangeLog
index e087a7d519..7e701139fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-01-10  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	* autogen.sh:
+	  Add -Wno-portability to the automake parameters to stop warnings
+	  about GNU make extensions being used. We require GNU make in almost
+	  every Makefile anyway.
+	  
+	* configure.ac:
+	  Use AM_PROG_CC_C_O as a compiler that accepts both -c and -o
+	  at the same time is required for per target flags.
+
 2008-01-09  Stefan Kost  <ensonic@users.sf.net>
 
 	* Makefile.am:
diff --git a/autogen.sh b/autogen.sh
index a889103ff1..0ce10a0d91 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -80,7 +80,7 @@ tool_run "$autoheader"
 echo timestamp > stamp-h.in 2> /dev/null
 
 tool_run "$autoconf"
-tool_run "$automake" "-a -c"
+tool_run "$automake" "-a -c -Wno-portability"
 
 # if enable exists, add an -enable option for each of the lines in that file
 if test -f enable; then
diff --git a/configure.ac b/configure.ac
index 87fe5ff8b6..8ce90b2fb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,6 +124,9 @@ AC_PROG_CXX
 dnl determine if c++ is available on this system
 AC_CHECK_PROG(HAVE_CXX, $CXX, yes, no)
 
+dnl check if the compiler supports '-c' and '-o' options
+AM_PROG_CC_C_O
+
 AC_PATH_PROG(VALGRIND_PATH, valgrind, no)
 AM_CONDITIONAL(HAVE_VALGRIND, test ! "x$VALGRIND_PATH" = "xno")