diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 97182e60d..734ebb12b 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Sat Mar 31 16:23:32 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* fhandler.cc (fhandler_base::read): Remove special handling of CTRL-Z.
+
 Sat Mar 31 11:09:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* fhandler.h (class fhandler_console): Add members `insert_mode'.
@@ -74,7 +78,7 @@ Thursday Mar 22 2001  Robert Collins <rbtcollins@hotmail.com>
 	native clipboard format.
 
 2001-03-22  Egor Duda  <deo@logos-m.ru>
-  
+
 	* fhandler_console.cc (fhandler_console::set_default_attr): Update
 	console color attributes on tty reset.
 
@@ -213,7 +217,7 @@ Fri Mar 16 20:25:40 2001  Christopher Faylor <cgf@cygnus.com>
 	Recognize new .lnk states.
 
 Saturday Mar 17 01:19 2001 Robert Collins rbtcollins@hotmail.com
-   
+
 	* cygwin.din: Export the new functions.
 	* pthread.cc (pthread_cond_*): Add wrapper functions that call
 	__pthread_cond* functions.
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index 9539d049a..adeec56a5 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -443,7 +443,6 @@ int
 fhandler_base::read (void *in_ptr, size_t in_len)
 {
   int len = (int) in_len;
-  char *ctrlzpos;
   char *ptr = (char *) in_ptr;
 
   int c;
@@ -475,6 +474,8 @@ fhandler_base::read (void *in_ptr, size_t in_len)
       return copied_chars;
     }
 
+#if 0
+  char *ctrlzpos;
   /* Scan buffer for a control-z and shorten the buffer to that length */
 
   ctrlzpos = (char *) memchr ((char *) ptr, 0x1a, copied_chars);
@@ -489,6 +490,7 @@ fhandler_base::read (void *in_ptr, size_t in_len)
       debug_printf ("returning 0 chars, text mode, CTRL-Z found");
       return 0;
     }
+#endif
 
   /* Scan buffer and turn \r\n into \n */
   register char *src = (char *) ptr;