diff --git a/ChangeLog b/ChangeLog
index 913f2d102f..972b04ada0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-10  Stefan Kost  <ensonic@users.sf.net>
+
+	* common/m4/gst-x11.m4:
+	  Restore CFLAGS and LIBS.
+
+	* configure.ac:
+	  Revert previous patch.
+
 2007-05-10  Stefan Kost  <ensonic@users.sf.net>
 
 	Patch by: Ali Sabil <ali.sabil@gmail.com>
diff --git a/configure.ac b/configure.ac
index e783a4b80d..bbe3cc0175 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,7 +290,6 @@ dnl OpenGL
 translit(dnm, m, l) AM_CONDITIONAL(USE_OPENGL, true)
 AG_GST_CHECK_X
 save_CPPFLAGS="$CPPFLAGS"
-save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 LIBS="$LIBS $X_LIBS"
@@ -299,7 +298,6 @@ AG_GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [
                       GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no")
 ])
 CPPFLAGS="$save_CPPFLAGS"
-CFLAGS="$save_CFLAGS"
 LIBS="$save_LIBS"
 
 dnl Check for X11