diff --git a/libpng.spec b/libpng.spec
index 5c9a795..5d97af2 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,7 +1,7 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
 Version: 1.2.2
-Release: 19.1
+Release: 22
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
@@ -9,6 +9,7 @@ Source2: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.2patch03-makefiles.ta
 Patch0: libpng-1.2.2-rhconf.patch
 Patch1: libpng-1.0.9-badchunks.patch
 Patch2: libpng-1.2.2-libdirfix.patch
+Patch3: libpng-1.2.2-oob_error_message.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -50,6 +51,7 @@ ln -s scripts/makefile.linux Makefile
 %patch0 -p1 -b .rhconf
 %patch1 -p1 -b .badchunk
 %patch2 -p1 -b .libdirfix
+%patch3 -p1 -b .oob_error_message
 
 %build
 make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
@@ -90,6 +92,16 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon May 3 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.2-22
+- Redo the out-of-bounds fix in a slightly better way.
+
+* Wed Apr 21 2004 Matthias Clasen <mclasen@redhat.com>
+- Bump release number to disambiguate n-v-rs.
+
+* Mon Apr 19 2004 Matthias Clasen <mclasen@redhat.com> 
+- fix a possible out-of-bounds read in the error message 
+  handler. #121229
+
 * Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt