diff --git a/ChangeLog b/ChangeLog
index d53334f67..313c10233 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-24  jacob berkman  <jacob@ximian.com>
+
+	* configure.in: fix x11 header checks when x11 is not in the
+	default include path
+
 2002-07-23  Ross Burton  <ross@burtonini.com>
 
 	* src/menu.c (meta_window_menu_new): Use the real workspace names
diff --git a/configure.in b/configure.in
index c38085cd8..f5e613c63 100644
--- a/configure.in
+++ b/configure.in
@@ -102,10 +102,10 @@ fi
 
 AC_PATH_XTRA
 
-CFLAGS="$METACITY_CFLAGS $CFLAGS $X_CFLAGS"
-
 XINERAMA_LIBS=
 found_xinerama=false
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 AC_CHECK_LIB(Xext, XineramaQueryExtension,
                [AC_CHECK_HEADERS(X11/extensions/Xinerama.h,
                                  XINERAMA_LIBS=-lXinerama found_xinerama=true)],
@@ -126,6 +126,8 @@ if test "$found_shape" = "true"; then
    AC_DEFINE(HAVE_SHAPE)
 fi
 
+CPPFLAGS="$save_CPPFLAGS"
+
 METACITY_LIBS="$XINERAMA_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_LIBS"
 METACITY_MESSAGE_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_MESSAGE_LIBS"
 METACITY_WINDOW_DEMO_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $METACITY_WINDOW_DEMO_LIBS"