diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 3ada9bf25..0c60e3525 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-26  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Makefile.in (CYGWIN_LIB): Variable pointing to libcygwin.a in
+	the parallel cygwin dir.
+	(cygserver.exe): Depend on and link against $CYGWIN_LIB.
+
 2003-11-25  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.in (CXXFLAGS): Remove duplicate options handled in
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index fa6960b73..333fcb92b 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -46,6 +46,8 @@ LIBOBJS:=${patsubst %.o,lib%.o,$(OBJS)}
 CYGWIN_OBJS:=$(cygwin_build)/smallprint.o $(cygwin_build)/version.o \
 	$(cygwin_build)/wincap.o
 
+CYGWIN_LIB:=$(cygwin_build)/libcygwin.a
+
 all: cygserver.exe
 
 install: all $(updir1)/mkinstalldirs cygserver.conf cygserver-config README
@@ -66,7 +68,7 @@ libclean:
 
 fullclean: clean libclean
 
-cygserver.exe: $(OBJS) $(CYGWIN_OBJS)
+cygserver.exe: $(OBJS) $(CYGWIN_OBJS) $(CYGWIN_LIB)
 	$(CXX) -o $@ $^
 
 $(cygwin_build)/%.o: $(cygwin_source)/%.cc