diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 6ec8da4aa..7fcee976e 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-08  Christopher Faylor  <cgf@timesys.com>
+
+	* cygserver.cc (main): Call wincap.init() earlier to avoid a NULL
+	dereference.
+
 2005-06-14  Corinna Vinschen  <corinna@vinschen.de>
 
 	* sysv_sem.cc (semu_list): Define static to avoid gcc 4.x compiler
diff --git a/winsup/cygserver/cygserver.cc b/winsup/cygserver/cygserver.cc
index 5cf82f38e..d19f1755c 100644
--- a/winsup/cygserver/cygserver.cc
+++ b/winsup/cygserver/cygserver.cc
@@ -567,6 +567,8 @@ main (const int argc, char *argv[])
 
   int opt;
 
+  wincap.init ();
+
   opterr = 0;
   while ((opt = getopt_long (argc, argv, opts, longopts, NULL)) != EOF)
     switch (opt)
@@ -701,7 +703,6 @@ main (const int argc, char *argv[])
   if (support_semaphores == TUN_UNDEF)
     support_semaphores = TUN_TRUE;
 
-  wincap.init ();
   if (wincap.has_security () && !setup_privileges ())
     panic ("Setting process privileges failed.");