diff --git a/.cvsignore b/.cvsignore
index 4220540..7089a26 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-libpng-1.0.14.tar.bz2
+libpng-1.2.2.tar.bz2
+libpng-1.2.2patch03-makefiles.tar.gz
diff --git a/libpng.spec b/libpng.spec
index c01abd0..c5296f6 100644
--- a/libpng.spec
+++ b/libpng.spec
@@ -1,18 +1,17 @@
 Summary: A library of functions for manipulating PNG image format files.
 Name: libpng
-Version: 1.0.14
-Release: 0.7x.4
-License: distributable
+Version: 1.2.2
+Release: 5
+License: OSI certified
 Group: System Environment/Libraries
 Source: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-%{version}.tar.bz2
-Patch0: libpng-1.0.6-rhconf.patch
+Source2: ftp://swrinde.nde.swri.edu/pub/png/src/libpng-1.2.2patch03-makefiles.tar.gz
+Patch0: libpng-1.2.2-rhconf.patch
 Patch1: libpng-1.0.9-badchunks.patch
-Patch2: libpng-1.0.12-transfix.patch
-
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 BuildPrereq: zlib-devel
 URL: http://www.libpng.org/pub/png/
-%define LIBVER 2.%{version}
+%define LIBVER 3.%{version}
 Epoch: 2
 Conflicts: qt < 2.2.2
 
@@ -42,10 +41,12 @@ the libpng package.
 
 %prep
 %setup -q
+## dump in the fixed makefiles (remove this with 1.2.3, presumably)
+(cd scripts && tar zxf %{SOURCE2})
+
 ln -s scripts/makefile.linux Makefile
 %patch0 -p1 -b .rhconf
 %patch1 -p1 -b .badchunk
-%patch2 -p1 -b .transfix
 
 %build
 make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" 
@@ -57,7 +58,9 @@ make install prefix=$RPM_BUILD_ROOT/usr
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{3,5}
 install -c -m 644 *.3 $RPM_BUILD_ROOT%{_mandir}/man3
 install -c -m 644 *.5 $RPM_BUILD_ROOT%{_mandir}/man5
-strip -R .comment --strip-unneeded $RPM_BUILD_ROOT/usr/lib/libpng.so.%{LIBVER}
+
+ln -s libpng12/png.h $RPM_BUILD_ROOT%{_includedir}
+ln -s libpng12/pngconf.h $RPM_BUILD_ROOT%{_includedir}
 
 # I don't know what this is doing here.
 rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
@@ -69,31 +72,48 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man5/libpng.so*
 %files
 %defattr(-,root,root)
 %doc *.txt example.c README TODO CHANGES
-/usr/lib/lib*.so.*
+%{_libdir}/libpng*.so.*
 %{_mandir}/man5/*
 
 %files devel
 %defattr(-,root,root)
-/usr/include/*
-/usr/lib/lib*.a
-/usr/lib/lib*.so
+%{_includedir}/*
+%{_libdir}/libpng*.a
+%{_libdir}/libpng*.so
+%{_libdir}/pkgconfig/*
 %{_mandir}/man3/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Thu Dec 19 2002 Jonathan Blandford <jrb@redhat.com>
-- fix security problem
+* Thu May 23 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
 
-* Thu Aug 01 2002 Phil Knirsch <pknirsch@redhat.com>
-- Fixed a file packaging problem.
-- Fixed library versioning.
+* Tue May  7 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.2-4
+- Don't own %{_libdir}/pkgconfig
+- Don't strip library, that's up to rpm
 
-* Tue Jul 23 2002 Phil Knirsch <pknirsch@redhat.com> 1.0.14-1
-- Updated to 1.0.14.
+* Tue May  7 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.2-3
+- Forgot png.h
 
-* Mon Jul 16 2001 Trond Eivind Glomsrød <teg@redhat.com> 1.0.12-2
+* Mon May  6 2002 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.2-2
+- Fix compatibility with everyone else.
+
+* Thu May  2 2002 Havoc Pennington <hp@redhat.com>
+- 1.2.2 plus makefile patches tarball
+- update file list to contain versioned libpng only
+
+* Wed Jan 09 2002 Tim Powers <timp@redhat.com>
+- automated rebuild
+
+* Mon Dec 17 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.1-1
+- 1.2.1
+
+* Wed Sep 19 2001 Bernhard Rosenkraenzer <bero@redhat.com> 1.2.0-1
+- 1.2.0
+
+* Mon Jul 16 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - s/Copyright/License/
 - fix weird versioning system (epoch was set to "2" in the main
   package, serial to "1" in the devel package. Huh?)
diff --git a/sources b/sources
index 8ab202e..90aae69 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-4f0dda0d5c1153e87dee905c49090877  libpng-1.0.14.tar.bz2
+0a22ea644cb8d0c86d32e2d2d008ea40  libpng-1.2.2.tar.bz2
+6a7b4d702a03e5bb930e53f34c1e7330  libpng-1.2.2patch03-makefiles.tar.gz