diff --git a/ChangeLog b/ChangeLog
index 0dfe077f57..212c5cf719 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-23  Tor Lillqvist  <tml@novell.com>
+
+	* configure.in: Fix logic error in saving and restoring CPPFLAGS
+	for the DirectInput checks.
+
 2007-02-22  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/pygimp/plug-ins/Makefile.am
diff --git a/configure.in b/configure.in
index 7edf527b4a..4ee7ffc36c 100644
--- a/configure.in
+++ b/configure.in
@@ -1415,10 +1415,10 @@ if test x"$os_win32" = xyes; then
            with_directx_sdk=;;
   esac
 
+  dinput_save_CPPFLAGS="$CPPFLAGS"
+  dinput_save_LDFLAGS="$CPPFLAGS"
   if test "x$with_directx_sdk" != x; then
-    dinput_save_CPPFLAGS="$CPPFLAGS"
     CPPFLAGS="-I $with_directx_sdk/Include $CPPFLAGS"
-    dinput_save_LDFLAGS="$CPPFLAGS"
     LDFLAGS="-L $with_directx_sdk/Lib/x86 $LDFLAGS"
     AC_CHECK_HEADER(dinput.h,
                     [AC_CHECK_LIB(dxguid, GUID_XAxis, have_dx_dinput=yes)])