diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index effa8386b..4be550ce5 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-01  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_registry.cc (fhandler_registry::open): Mark /proc/registry
+	directory and siblings as nohandle fhandler.
+
 2009-11-30  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	* speclib: Use last dll found since that's the real name of the cygwin
diff --git a/winsup/cygwin/fhandler_registry.cc b/winsup/cygwin/fhandler_registry.cc
index 904184e63..bb0ea048c 100644
--- a/winsup/cygwin/fhandler_registry.cc
+++ b/winsup/cygwin/fhandler_registry.cc
@@ -664,6 +664,8 @@ fhandler_registry::open (int flags, mode_t mode)
       else
 	{
 	  flags |= O_DIROPEN;
+	  /* Marking as nohandle allows to call dup. */
+	  nohandle (true);
 	  goto success;
 	}
     }