diff --git a/libpng.spec b/libpng.spec
index 20245ca..46f79ca 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,15 +1,14 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
 Version: 1.2.5
-Release: 6
+Release: 9
 License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
 Patch0: libpng-1.2.5-rhconf.patch
 Patch1: libpng-1.2.2-libdirfix.patch
-Patch2: libpng-1.2.5-oob_error_message.patch
-Patch3: libpng-1.2.5-misc.patch
-Patch4: libpng-1.0.15-transfix.patch
+Patch2: libpng-1.2.5-misc.patch
+Patch3: libpng-1.2.5-security.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 Provides: libpng.so.3
@@ -48,9 +47,8 @@ the libpng package.
 ln -s scripts/makefile.linux Makefile
 %patch0 -p1 -b .rhconf
 %patch1 -p1 -b .libdirfix
-%patch2 -p1 -b .oob_error_message
-%patch3 -p1 -b .misc
-%patch4 -p1 -b .transfix
+%patch2 -p1 -b .misc
+%patch3 -p1 -b .security
 
 %build
 make ZLIBLIB=%{_libdir} RPM_OPT_FLAGS="$RPM_OPT_FLAGS" LIBPATH=%{_libdir}
@@ -66,7 +64,7 @@ make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
 
 %files
 %defattr(-,root,root)
-%doc *.txt example.c README TODO CHANGES
+%doc *.txt example.c README TODO CHANGES LICENSE 
 %{_libdir}/libpng*.so.*
 %{_mandir}/man5/*
 
@@ -83,6 +81,20 @@ make install prefix=$RPM_BUILD_ROOT/usr LIBPATH=$RPM_BUILD_ROOT%{_libdir}
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Aug 4 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.5-9
+- Build for FC3
+
+* Fri Jul 30 2004 Matthias Clasen <mclasen@redhat.com> 
+- Include LICENSE.
+
+* Fri Jul 23 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.5-8
+- Build for FC2
+
+* Fri Jul 23 2004 Matthias Clasen <mclasen@redhat.com> 2:1.2.5-7
+- Replace the patches for individual security problems with the
+  cumulative patch issued by the png developers. 
+- Build for FC1
+
 * Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
 - rebuilt