diff --git a/ChangeLog b/ChangeLog
index 790d90fc3d..4fddd5ed16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set the HAVE_X11R6 automake conditional to false
+	if not compiling for X11.
+
 2003-05-06  Tor Lillqvist  <tml@iki.fi>
 
 	Fix for #110165 (thanks to Arnaud Charlet):
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 790d90fc3d..4fddd5ed16 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-05-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set the HAVE_X11R6 automake conditional to false
+	if not compiling for X11.
+
 2003-05-06  Tor Lillqvist  <tml@iki.fi>
 
 	Fix for #110165 (thanks to Arnaud Charlet):
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 790d90fc3d..4fddd5ed16 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-05-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set the HAVE_X11R6 automake conditional to false
+	if not compiling for X11.
+
 2003-05-06  Tor Lillqvist  <tml@iki.fi>
 
 	Fix for #110165 (thanks to Arnaud Charlet):
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 790d90fc3d..4fddd5ed16 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-05-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set the HAVE_X11R6 automake conditional to false
+	if not compiling for X11.
+
 2003-05-06  Tor Lillqvist  <tml@iki.fi>
 
 	Fix for #110165 (thanks to Arnaud Charlet):
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 790d90fc3d..4fddd5ed16 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-05-08  Sven Neumann  <sven@gimp.org>
+
+	* configure.in: set the HAVE_X11R6 automake conditional to false
+	if not compiling for X11.
+
 2003-05-06  Tor Lillqvist  <tml@iki.fi>
 
 	Fix for #110165 (thanks to Arnaud Charlet):
diff --git a/configure.in b/configure.in
index 3c128b5b83..013b355a21 100644
--- a/configure.in
+++ b/configure.in
@@ -1251,6 +1251,7 @@ else
   AM_CONDITIONAL(HAVE_XFT, false)
   AM_CONDITIONAL(XINPUT_XFREE, false)
   AM_CONDITIONAL(USE_X11, false)
+  AM_CONDITIONAL(HAVE_X11R6, false)
 fi
 
 if test "x$gdktarget" = "xwin32"; then