diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 049f82ef4..a3fe9a3b9 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* uinfo.cc (uinfo_init): Call reimpersonate to set the main thread's
+	impersonation token.
+
 2005-06-20  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler_proc.cc (format_proc_partitions): Only list recognized
diff --git a/winsup/cygwin/uinfo.cc b/winsup/cygwin/uinfo.cc
index 55b6b6c5d..d63f93d3d 100644
--- a/winsup/cygwin/uinfo.cc
+++ b/winsup/cygwin/uinfo.cc
@@ -159,6 +159,7 @@ uinfo_init ()
   cygheap->user.curr_primary_token = NO_IMPERSONATION;
   cygheap->user.current_token = NO_IMPERSONATION;
   cygheap->user.set_saved_sid ();	/* Update the original sid */
+  cygheap->user.reimpersonate ();
 }
 
 extern "C" int