--- src/Makefile.am.orig	2005-12-27 14:15:23.000000000 -0600
+++ src/Makefile.am	2005-12-27 14:16:14.000000000 -0600
@@ -22,7 +22,7 @@
 # try and remove naming ocnflicts and fix Automake to allow particular includes
 # to be attached only to particular object files.  Short term fix is either or.
 ##INCLUDES = -I. -I.. -I$(srcdir) -I$(top_srcdir)/lib
-INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff -I$(top_srcdir)/zlib $(includeopt)
+INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/diff $(includeopt)
 
 bin_PROGRAMS = cvs
 bin_SCRIPTS = cvsbug
@@ -103,7 +103,7 @@
 cvs_LDADD = \
 	../diff/libdiff.a \
 	../lib/libcvs.a \
-	../zlib/libz.a
+	-lz
 
 # extra clean targets
 # wish this could be distclean-hdr-local but it's not part of automake
--- configure.in.orig	2005-12-27 14:14:34.000000000 -0600
+++ configure.in	2005-12-27 14:14:53.000000000 -0600
@@ -1040,8 +1040,7 @@
 	  tools/Makefile \
 	  vms/Makefile \
 	  windows-NT/Makefile \
-	  windows-NT/SCC/Makefile \
-	  zlib/Makefile])
+	  windows-NT/SCC/Makefile])
 
 dnl and we're done
 AC_OUTPUT
--- Makefile.am.orig	2005-12-27 14:15:08.000000000 -0600
+++ Makefile.am	2005-12-27 14:15:16.000000000 -0600
@@ -17,7 +17,7 @@
 ## Subdirectories to run make in for the primary targets.
 # Unix source subdirs, where we'll want to run lint and etags:
 # This is a legacy variable from b4 Automake
-USOURCE_SUBDIRS = lib zlib diff src
+USOURCE_SUBDIRS = lib diff src
 # All other subdirs:
 SUBDIRS = $(USOURCE_SUBDIRS) man doc contrib tools \
 	windows-NT os2 emx vms