diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 40d7d7072..c4bd8f34c 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 12 23:11:05 2000  Christopher Faylor <cgf@cygnus.com>
+
+	* dtable.cc (dtable::fixup_after_fork): Revert thinko below.
+	* pinfo.cc (set_myself): Show pid in initial strace line.
+
 Thu Oct 12 17:58:03 2000  Christopher Faylor <cgf@cygnus.com>
 
 	* child_info: Bump child_info "version".
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc
index ec05498f8..7d520b6da 100644
--- a/winsup/cygwin/dtable.cc
+++ b/winsup/cygwin/dtable.cc
@@ -472,9 +472,7 @@ dtable::fixup_after_fork (HANDLE parent)
   for (size_t i = 0; i < size; i++)
     if ((fh = fds[i]) != NULL)
       {
-	if (fds[i]->get_close_on_exec ())
-	  release (i);
-	else if (fh->get_need_fork_fixup ())
+	if (fds[i]->get_close_on_exec () || fh->get_need_fork_fixup ())
 	  {
 	    debug_printf ("fd %d(%s)", i, fh->get_name ());
 	    fh->fixup_after_fork (parent);
diff --git a/winsup/cygwin/pinfo.cc b/winsup/cygwin/pinfo.cc
index 1ce6ace2c..f14b45c60 100644
--- a/winsup/cygwin/pinfo.cc
+++ b/winsup/cygwin/pinfo.cc
@@ -54,7 +54,7 @@ set_myself (pid_t pid, HANDLE h)
     {
       extern char osname[];
       strace.prntf (1, NULL, "**********************************************");
-      strace.prntf (1, NULL, "Program name: %s", myself->progname);
+      strace.prntf (1, NULL, "Program name: %s (%d)", myself->progname, myself->pid);
       strace.prntf (1, NULL, "App version:  %d.%d, api: %d.%d",
 		       user_data->dll_major, user_data->dll_minor,
 		       user_data->api_major, user_data->api_minor);