diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4bff31081..368c0f405 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+Wed Sep 12 23:06:00 2001  Corinna Vinschen <corinna@vinschen.de>
+
+	* wincap.cc (wincapc::init): Simplify W2K/XP case.
+
 Wed Sep 12 23:02:00 2001  Corinna Vinschen <corinna@vinschen.de>
 
 	* wincap.cc (wincapc::init): Set os name to "NT" on XP, too.
diff --git a/winsup/cygwin/wincap.cc b/winsup/cygwin/wincap.cc
index c4c4188b4..857af10ac 100644
--- a/winsup/cygwin/wincap.cc
+++ b/winsup/cygwin/wincap.cc
@@ -402,16 +402,11 @@ wincapc::init ()
 	        caps = &wincap_nt4sp4;
 	      break;
 	    case 5:
+	      os = "NT";
 	      if (version.dwMinorVersion == 0)
-	        {
-		  os = "NT";
-		  caps = &wincap_2000;
-		}
+		caps = &wincap_2000;
 	      else
-	        {
-		  os = "NT";
-		  caps = &wincap_xp;
-		}
+		caps = &wincap_xp;
 	      break;
 	    default:
 	      os = "??";