diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 073c3e48e..fe3d94572 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,9 +1,13 @@
+2009-06-04  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_console.cc (fhandler_console::read): Allow Ctrl-Space to
+	emit a NUL byte.
+
 2009-06-04  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* thread.cc (__cygwin_lock_lock):  Delete racy optimisation.
 	(__cygwin_lock_unlock):  Likewise.
 
-
 2009-06-03  IWAMURO Motnori  <deenheart@gmail.com>
 
 	* strfuncs.cc (sys_cp_mbstowcs): Fix condition.
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index fe9307cfe..f3d26f40d 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -323,6 +323,10 @@ fhandler_console::read (void *pv, size_t& buflen)
 		      ? (dev_state->metabit ? "\377" : "\033\177") : "\177";
 	      nread = strlen (toadd);
 	    }
+	  /* Allow Ctrl-Space to emit ^@ */
+	  else if (input_rec.Event.KeyEvent.wVirtualKeyCode == VK_SPACE
+		   && (control_key_state & CTRL_PRESSED))
+	    toadd = "";
 	  else if (wch == 0
 	      /* arrow/function keys */
 	      || (input_rec.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))