diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 2db4407ad..66e91c48e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-31  Corinna Vinschen  <corinna@vinschen.de>
+
+	* cygheap.cc (cygheap_user::set_name): Allow to change the user name
+	if it only differs by case.
+
 2010-05-26  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_registry.cc (multi_wcstombs): New function.
diff --git a/winsup/cygwin/cygheap.cc b/winsup/cygwin/cygheap.cc
index 6cbdda934..623fd765d 100644
--- a/winsup/cygwin/cygheap.cc
+++ b/winsup/cygwin/cygheap.cc
@@ -446,7 +446,9 @@ cygheap_user::set_name (const char *new_name)
 
   if (allocated)
     {
-      if (strcasematch (new_name, pname))
+      /* Windows user names are case-insensitive.  Here we want the correct
+         username, though, even if it only differs by case. */
+      if (!strcmp (new_name, pname))
 	return;
       cfree (pname);
     }