diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index ddf8cd82d..299b0d635 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 14 00:37:54 2001  Christopher Faylor <cgf@cygnus.com>
+
+	* fork.cc (vfork): Avoid recursive vforks.
+
 Fri Sep 14 00:18:52 2001  Christopher Faylor <cgf@cygnus.com>
 
 	* fhandler.h (fhandler_pipe::is_slow): Return true only if pipes are
diff --git a/winsup/cygwin/fork.cc b/winsup/cygwin/fork.cc
index 83e25393f..b2f4d7c84 100644
--- a/winsup/cygwin/fork.cc
+++ b/winsup/cygwin/fork.cc
@@ -705,6 +705,8 @@ vfork ()
 
   if (vf == NULL)
     vf = vfork_storage.create ();
+  else if (vf->pid)
+    return fork ();
 
   if (!setjmp (vf->j))
     {
@@ -735,6 +737,8 @@ vfork ()
 	exit (exitval);
     }
 
-  return vf->pid;
+  int pid = vf->pid;
+  vf->pid = 0;
+  return pid;
 #endif
 }