diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c531ee268..54510dd2a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uinfo.cc (cygheap_user::env_userprofile): Convert native
+	userprofile path returned from get_registry_hive_path to Win32 path.
+
 2012-02-08  Corinna Vinschen  <corinna@vinschen.de>
 
 	* dll_init.cc: Throughout, drop usage of modname in favor of name.
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index ee90e52d3..eddfcec2b 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -440,7 +440,15 @@ cygheap_user::env_userprofile (const char *name, size_t namelen)
 
   cfree_and_set (puserprof, almost_null);
   if (get_registry_hive_path (get_windows_id (win_id), userprofile_env_buf))
-    sys_wcstombs_alloc (&puserprof, HEAP_STR, userprofile_env_buf);
+    {
+      PWCHAR up = userprofile_env_buf + 4;
+      if (!wcsncasecmp (up, L"UNC\\", 4))
+	{
+	  up += 2;
+	  *up = L'\\';
+	}
+      sys_wcstombs_alloc (&puserprof, HEAP_STR, up);
+    }
 
   return puserprof;
 }