diff --git a/ChangeLog b/ChangeLog
index c74269b3ae..2a4cc3f1a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-22  Sebastian Dröge  <slomo@circular-chaos.org>
+
+	Patch by: Brian Cameron <brian dot cameron at sun dot com>
+
+	* configure.ac:
+	Don't hardcode -Wall and -Werror for configure checks, this fails
+	with non-GCC compilers. Fixes bug #517991.
+
 2008-02-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* gst/audiotestsrc/gstaudiotestsrc.c:
diff --git a/configure.ac b/configure.ac
index 15ab88f365..3056a6f47e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,7 +183,7 @@ AM_CONDITIONAL(HAVE_REGEX_H, test "x$HAVE_REGEX_H" = "xyes")
 
 if test "x$HAVE_REGEX_H" = "xyes"; then
   ac_cppflags_save="$CPPFLAGS"
-  CPPFLAGS="-Wall -Werror `$PKG_CONFIG --cflags libxml-2.0`"
+  CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0`"
   AC_COMPILE_IFELSE(
     AC_LANG_PROGRAM([
 #include <libxml/HTMLparser.h>
@@ -543,9 +543,6 @@ AG_GST_CHECK_FEATURE(VORBIS, [Xiph Vorbis audio codec], vorbis, [
 
 if test "x$HAVE_VORBIS" = "xyes"; then
   ac_cflags_save="$CFLAGS"
-  dnl FIXME: does this work on non-gcc? -- Company
-  dnl FIXME: no, it doesn't.  Why is this here in the first place ? -- thomasvs
-  CFLAGS="-Wall -Werror"
   AC_COMPILE_IFELSE(
     AC_LANG_PROGRAM([
 #include <vorbis/codec.h>