diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 38789fb75..bd8cc5216 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-13  Corinna Vinschen  <corinna@vinschen.de>
+
+	* winsup.h (clear_procimptoken): Close hProcImpToken in a safer way.
+
 2006-12-13  Corinna Vinschen  <corinna@vinschen.de>
 
 	* security.cc (lsaauth): Initialize lsa to INVALID_HANDLE_VALUE to
diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h
index 4174b510c..83ca0feac 100644
--- a/winsup/cygwin/winsup.h
+++ b/winsup/cygwin/winsup.h
@@ -365,8 +365,9 @@ inline void clear_procimptoken ()
 {
   if (hProcImpToken)
     {
-      CloseHandle (hProcImpToken);
+      HANDLE old_procimp = hProcImpToken;
       hProcImpToken = NULL;
+      CloseHandle (old_procimp);
     }
 }