diff --git a/ChangeLog b/ChangeLog
index 03789f28d..8ab6c1ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20050222
+ - (dtucker) [uidswap.c] Skip uid restore test on Cygwin.  Patch from
+   vinschen at redhat.com.
+
 20050220
  - (dtucker) [LICENCE Makefile.in README.platform audit-bsm.c configure.ac
    defines.h] Bug #125: Add *EXPERIMENTAL* BSM audit support.  Configure
@@ -2156,4 +2160,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3661 2005/02/20 12:27:11 dtucker Exp $
+$Id: ChangeLog,v 1.3662 2005/02/22 06:57:13 dtucker Exp $
diff --git a/uidswap.c b/uidswap.c
index fa3d7a3b1..aab7064eb 100644
--- a/uidswap.c
+++ b/uidswap.c
@@ -56,10 +56,12 @@ temporarily_use_uid(struct passwd *pw)
 	debug("temporarily_use_uid: %u/%u (e=%u/%u)",
 	    (u_int)pw->pw_uid, (u_int)pw->pw_gid,
 	    (u_int)saved_euid, (u_int)saved_egid);
+#ifndef HAVE_CYGWIN
 	if (saved_euid != 0) {
 		privileged = 0;
 		return;
 	}
+#endif
 #else
 	if (geteuid() != 0) {
 		privileged = 0;