diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5eaa039bd..3fb523210 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-29  Eric Blake  <ebb9@byu.net>
+
+	* syscalls.cc (rename): Fix regression in rename("dir","d/").
+
 2009-09-29  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_socket.cc (fhandler_socket::recv_internal): Always call
diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 67dddf3d9..1d160d369 100644
--- a/winsup/cygwin/syscalls.cc
+++ b/winsup/cygwin/syscalls.cc
@@ -1668,17 +1668,20 @@ rename (const char *oldpath, const char *newpath)
 
   if (!*oldpath || !*newpath)
     {
+      /* Reject rename("","x"), rename("x","").  */
       set_errno (ENOENT);
       goto out;
     }
   if (has_dot_last_component (oldpath, true))
     {
+      /* Reject rename("dir/.","x").  */
       oldpc.check (oldpath, PC_SYM_NOFOLLOW, stat_suffixes);
       set_errno (oldpc.isdir () ? EINVAL : ENOTDIR);
       goto out;
     }
   if (has_dot_last_component (newpath, true))
     {
+      /* Reject rename("dir","x/.").  */
       newpc.check (newpath, PC_SYM_NOFOLLOW, stat_suffixes);
       set_errno (!newpc.exists () ? ENOENT : newpc.isdir () ? EINVAL : ENOTDIR);
       goto out;
@@ -1724,6 +1727,7 @@ rename (const char *oldpath, const char *newpath)
     }
   if (old_dir_requested && !oldpc.isdir ())
     {
+      /* Reject rename("file/","x").  */
       set_errno (ENOTDIR);
       goto out;
     }
@@ -1759,21 +1763,16 @@ rename (const char *oldpath, const char *newpath)
       set_errno (EROFS);
       goto out;
     }
-  if (new_dir_requested)
+  if (new_dir_requested && !(newpc.exists ()
+                             ? newpc.isdir () : oldpc.isdir ()))
     {
-      if (!newpc.exists())
-        {
-          set_errno (ENOENT);
-          goto out;
-        }
-      if (!newpc.isdir ())
-        {
-          set_errno (ENOTDIR);
-          goto out;
-        }
+      /* Reject rename("file1","file2/"), but allow rename("dir","d/").  */
+      set_errno (newpc.exists () ? ENOTDIR : ENOENT);
+      goto out;
     }
   if (newpc.exists () && (oldpc.isdir () ? !newpc.isdir () : newpc.isdir ()))
     {
+      /* Reject rename("file","dir") and rename("dir","file").  */
       set_errno (newpc.isdir () ? EISDIR : ENOTDIR);
       goto out;
     }