diff --git a/.cvsignore b/.cvsignore
index e485b2f..769b2ef 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgdiplus-1.2.4.tar.bz2
+libgdiplus-1.2.5.tar.bz2
diff --git a/libgdiplus.spec b/libgdiplus.spec
index 555207a..6327857 100644
--- a/libgdiplus.spec
+++ b/libgdiplus.spec
@@ -1,5 +1,5 @@
 Name:           libgdiplus
-Version:        1.2.4
+Version:        1.2.5
 Release:        1%{?dist}
 Summary:        libgdiplus: An Open Source implementation of the GDI+ API
 
@@ -10,11 +10,8 @@ Source0:        %{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  freetype-devel glib2-devel libjpeg-devel libtiff-devel
-BuildRequires:  libungif-devel libpng-devel
-# We don't actually use the external cairo yet, but this is an easy way
-# to pull in the right cairo requirements for the internal copy
-# libXt-devel also required for now...
-BuildRequires:  cairo-devel libXt-devel
+BuildRequires:  libungif-devel libpng-devel fontconfig-devel
+BuildRequires:  cairo-devel
 BuildRequires:  zlib-devel
 
 %description
@@ -31,18 +28,16 @@ Development files for libgdiplus
 
 %prep
 %setup -q
-
-%build
-%configure
 perl -pi -e "s,-Werror,,g" src/Makefile
-make %{?_smp_mflags}
 
+%build
+%configure --disable-static 
+make %{?_smp_mflags} 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_libdir}/*.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %clean
@@ -53,31 +48,43 @@ rm -rf $RPM_BUILD_ROOT
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS README TODO MPL-1.1.html AUTHORS
-# We need the .so in the main package, because mono opens libgdiplus.so
-%{_libdir}/lib*.so*
+%defattr(-,root,root,-)
+%{_libdir}/lib*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %doc ChangeLog
+%defattr(-,root,root,-)
 %{_libdir}/pkgconfig/*
+%{_libdir}/lib*.so
 
 %changelog
-* Sat Jun  2 2007 Christopher Aillon <caillon@redhat.com> 1.2.4-1
-- Update to 1.2.4
+* Fri Oct 05 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.5-1
+- bump to 1.2.5
+- disabled static build
+- added fontconfig-devel requirement
+
+* Fri Apr 21 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.4-1
+- bump
+
+* Fri Jan 26 2007 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.3-1
+- bump
+
+* Sat Dec 02 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.2-1
+- bump
 
-* Thu Feb  8 2007 Alexander Larsson <alexl@redhat.com> - 1.2.3-1
-- Update to 1.2.3
+* Sat Nov 25 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2.1-1
+- bump
 
-* Mon Dec  4 2006 Alexander Larsson <alexl@redhat.com> - 1.2.2-1
-- Update to 1.2.2
-- add ldconfig post/postun
-- Added doc files
+* Fri Nov 03 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.2-1
+- bump
+- added post and postun
+- put the .so file in the devel package
 
-* Fri Sep  1 2006 Alexander Larsson <alexl@redhat.com> - 1.1.17-1
-- update to 1.1.17
-- Break out .pc file in devel subpackage (#205055)
+* Sat Sep 02 2006 Paul F. Johnson <paul@all-the-johnsons.co.uk> 1.1.17-1
+- bump
+- added devel package
+- swapped the perl script into prep (where it should be!)
 
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - sh: line 0: fg: no job control
 - rebuild
diff --git a/sources b/sources
index 75b89b0..c2041d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cf86212084a7b9cc3660efa5baf1cb98  libgdiplus-1.2.4.tar.bz2
+82bbf6ca86b85e5148a15d8d88c6e548  libgdiplus-1.2.5.tar.bz2