diff --git a/.cvsignore b/.cvsignore
index f395133..7993b88 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zlib-1.2.0.7.tar.gz
+zlib-1.2.1.1.tar.gz
diff --git a/sources b/sources
index 22b30d5..8e43a8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d6c16e26c23f083b5860290eaba50214  zlib-1.2.0.7.tar.gz
+e30f85eed4ecb32841cafe12673c6590  zlib-1.2.1.1.tar.gz
diff --git a/zlib.spec b/zlib.spec
index bdb9765..eed82de 100644
--- a/zlib.spec
+++ b/zlib.spec
@@ -1,11 +1,10 @@
 Summary: The zlib compression and decompression library.
 Name: zlib
-Version: 1.2.0.7
-Release: 2
+Version: 1.2.1.1
+Release: 1
 Group: System Environment/Libraries
 Source: ftp://ftp.info-zip.org/pub/infozip/zlib/zlib-%{version}.tar.gz
 Patch0: zlib-1.1.4-make-test.patch
-Patch1: zlib-1.2.0.7-jbj.patch
 URL: http://www.gzip.org/zlib/
 License: BSD
 Prefix: %{_prefix}
@@ -28,7 +27,6 @@ library.
 %prep
 %setup -q
 %patch0 -p1 -b .make-test
-%patch1 -p1 -b .jbj
 
 %build
 
@@ -80,6 +78,15 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_mandir}/man3/zlib.3*
 
 %changelog
+* Sun Jan 18 2004 Jeff Johnson <jbj@jbj.org> 1.2.1.1-1
+- upgrade to zlib-1.2.1.1.
+
+* Sun Nov 30 2003 Florian La Roche <Florian.LaRoche@redhat.de>
+- update to 1.2.1 release
+
+* Mon Oct 13 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-3
+- unrevert zlib.h include constants (#106291), rejected upstream.
+
 * Wed Oct  8 2003 Jeff Johnson <jbj@jbj.org> 1.2.0.7-2
 - fix: gzeof not set when reading compressed file (#106424).
 - fix: revert zlib.h include constants for now (#106291).