diff --git a/ChangeLog b/ChangeLog
index 130a3abe4f5cfdb70ee20e768c4451601b9386c3..a8b9330975a0c35dc4d18e19964b750a2a69e8f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-07-05  Niels Möller  <nisse@cuckoo.hack.org>
+
+	* src/lshd.c: Disabled incomplete x11 forwarding for now.
+	* src/server_session.c: Likewise.
+	* src/server_x11.c: Likewise.
+	
 2002-07-03  Pontus Sköld  <pont@soua.net>
 
 	* src/lshg.c: Include <unistd.h> to get execvp declaration, define
diff --git a/src/lshd.c b/src/lshd.c
index 33432a3ed2c6c22be87984094812c954fc711c8c..882ea6c9e4a9664c2d2ebd4936a0eceb8abc06e5 100644
--- a/src/lshd.c
+++ b/src/lshd.c
@@ -89,6 +89,10 @@ struct command_2 close_on_sighup;
 #include <unistd.h>
 #endif
 
+/* Disabled in the 1.4 series. */
+#undef WITH_X11_FORWARD
+#define WITH_X11_FORWARD 0
+
 /* Option parsing */
 
 const char *argp_program_version
diff --git a/src/server_session.c b/src/server_session.c
index 926f3dd533e669e37f1cc0d62c4a1d7f50782d5a..1a3bfb0e1e7df1f3e9c3f30a405d25fdb5594633 100644
--- a/src/server_session.c
+++ b/src/server_session.c
@@ -53,6 +53,9 @@
 
 #include "server_session.c.x"
 
+/* Disabled in the 1.4 series. */
+#undef WITH_X11_FORWARD
+#define WITH_X11_FORWARD 0
 
 /* Session */
 /* GABA:
diff --git a/src/server_x11.c b/src/server_x11.c
index 3230e155def1ce8ec2630c5d054810e9e1fc18f8..6769dd288b0270d1a373a5124eda4df4e94858df 100644
--- a/src/server_x11.c
+++ b/src/server_x11.c
@@ -43,6 +43,10 @@
 
 #include "server_x11.c.x"
 
+/* Disabled in the 1.4 series. */
+#undef WITH_X11_FORWARD
+#define WITH_X11_FORWARD 0
+
 #if WITH_X11_FORWARD
 
 #define XAUTH_DEBUG_TO_STDERR 0