diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 3e253faf329dcf9bc885e96baac3d7d839f57352..5569030bb7dd449cbe12af3f51b3f8ca12702e53 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2004-10-11  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/14856:
+	* Imported zlib 1.2.1; merged local changes.
+
 2005-06-15  Paolo Bonzini  <bonzini@gnu.org>
 
 	* Makefile.am: Remove useless multilib rules.