diff --git a/ChangeLog b/ChangeLog
index 465b26c66..bba7a665e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20010226
+ - (bal) Applied shutdown() patch for sftp.c by  Corinna Vinschen 
+   <vinschen@redhat.com>
+
 20010226
  - (bal) Fixed bsd-snprinf.c so it now honors 'BROKEN_SNPRINTF' again.
  - (djm) Some systems (SCO3, NeXT) have weird saved uid semantics. 
@@ -4131,4 +4135,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.823 2001/02/26 09:49:58 djm Exp $
+$Id: ChangeLog,v 1.824 2001/02/26 20:04:45 mouring Exp $
diff --git a/sftp.c b/sftp.c
index b4775c02f..0fba6749f 100644
--- a/sftp.c
+++ b/sftp.c
@@ -246,11 +246,18 @@ main(int argc, char **argv)
 
 	interactive_loop(in, out);
 
+#if !defined(USE_PIPES)
+        shutdown(in, SHUT_RDWR);
+        shutdown(out, SHUT_RDWR);
+#endif
+
 	close(in);
 	close(out);
 
+#if !defined(HAVE_CYGWIN)
 	if (kill(sshpid, SIGHUP) == -1)
 		fatal("Couldn't terminate ssh process: %s", strerror(errno));
+#endif
 
 	if (waitpid(sshpid, NULL, 0) == -1)
 		fatal("Couldn't wait for ssh process: %s", strerror(errno));