diff -ru zlib-1.2.3/ChangeLog zlib/ChangeLog
--- zlib-1.2.3/ChangeLog	2005-07-18 09:26:09.000000000 -0400
+++ zlib/ChangeLog	2005-10-22 00:01:00.000000000 -0400
@@ -1,6 +1,12 @@
 
                 ChangeLog file for zlib
 
+Changes in 1.2.3-optipng (22 October 2005) [Truta]
+- Hard-code OptiPNG -specific build options into zlib.h:
+  NO_GZCOMPRESS, NO_GZIP, TOO_FAR=32768U
+- Remove all contrib/ entries, except the ASM implementations
+- Fix FILEVERSION and PRODUCTVERSION in win32/zlib1.rc
+
 Changes in 1.2.3 (18 July 2005)
 - Apply security vulnerability fixes to contrib/infback9 as well
 - Clean up some text files (carriage returns, trailing space)
Only in zlib-1.2.3/contrib: ada
Only in zlib-1.2.3/contrib: blast
Only in zlib-1.2.3/contrib: delphi
Only in zlib-1.2.3/contrib: dotzlib
Only in zlib-1.2.3/contrib: infback9
Only in zlib-1.2.3/contrib: iostream
Only in zlib-1.2.3/contrib: iostream2
Only in zlib-1.2.3/contrib: iostream3
Only in zlib-1.2.3/contrib/masmx64: gvmat64.obj
Only in zlib-1.2.3/contrib/masmx64: inffasx64.obj
Only in zlib-1.2.3/contrib/masmx86: gvmat32.obj
Only in zlib-1.2.3/contrib/masmx86: inffas32.obj
Only in zlib-1.2.3/contrib: minizip
Only in zlib-1.2.3/contrib: pascal
Only in zlib-1.2.3/contrib: puff
Only in zlib-1.2.3/contrib: testzlib
Only in zlib-1.2.3/contrib: untgz
Only in zlib-1.2.3/contrib: vstudio
diff -ru zlib-1.2.3/win32/zlib1.rc zlib/win32/zlib1.rc
--- zlib-1.2.3/win32/zlib1.rc	2005-07-17 22:35:36.000000000 -0400
+++ zlib/win32/zlib1.rc	2005-10-21 20:25:00.000000000 -0400
@@ -5,8 +5,8 @@
 #else
 VS_VERSION_INFO		VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
 #endif
-  FILEVERSION		1,2,2,0
-  PRODUCTVERSION	1,2,2,0
+  FILEVERSION		1,2,3,0
+  PRODUCTVERSION	1,2,3,0
   FILEFLAGSMASK		VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
   FILEFLAGS		1
diff -ru zlib-1.2.3/zlib.h zlib/zlib.h
--- zlib-1.2.3/zlib.h	2005-07-17 22:26:49.000000000 -0400
+++ zlib/zlib.h	2005-10-22 00:01:00.000000000 -0400
@@ -1,5 +1,14 @@
+/*
+ * zlib-1.2.3-optipng -- MODIFIED version of zlib by Cosmin Truta.
+ * PLEASE DO NOT SEND BUG REPORTS TO THE ORIGINAL zlib AUTHORS!
+ */
+
+#define NO_GZCOMPRESS
+#define NO_GZIP
+#define TOO_FAR 32768U
+
+
 /* zlib.h -- interface of the 'zlib' general purpose compression library
-  version 1.2.3, July 18th, 2005
 
   Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
 
@@ -37,8 +46,8 @@
 extern "C" {
 #endif
 
-#define ZLIB_VERSION "1.2.3"
-#define ZLIB_VERNUM 0x1230
+#define ZLIB_VERSION "1.2.3-optipng"
+#define ZLIB_VERNUM 0x123f
 
 /*
      The 'zlib' compression library provides in-memory compression and