diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index 8c5b4c5bf..a104a72c4 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-18  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.in: Don't attempt to use zlib directory as a dependency if
+	it doesn't exist.
+
 2001-12-14  Christopher Faylor  <cgf@redhat.com>
 
 	* configure.in: Detect zlib subdirectory.
diff --git a/winsup/Makefile.in b/winsup/Makefile.in
index 7ed371ea2..4a6d23e25 100644
--- a/winsup/Makefile.in
+++ b/winsup/Makefile.in
@@ -39,6 +39,7 @@ includedir:=@includedir@
 SUBDIRS=@SUBDIRS@
 INSTALL_SUBDIRS=${patsubst %,install_%,$(SUBDIRS)}
 CLEAN_SUBDIRS=${patsubst %,clean_%,$(SUBDIRS)}
+ZLIB=${findstring zlib,$(SUBDIRS)}
 
 .PHONY: all install clean all-info info install-info check \
 	$(SUBDIRS) $(INSTALL_SUBDIRS) $(CLEAN_SUBDIRS)
@@ -107,7 +108,7 @@ mingw: w32api
 
 cygwin: w32api
 
-cinstall: mingw bz2lib zlib
+cinstall: mingw bz2lib $(ZLIB)
 
 install_utils: cygwin mingw
 
@@ -115,4 +116,4 @@ install_mingw: w32api
 
 install_cygwin: w32api
 
-install_cinstall: mingw bz2lib zlib
+install_cinstall: mingw bz2lib $(ZLIB)