diff --git a/libwmf.spec b/libwmf.spec
index c792e09..6124ade 100644
--- a/libwmf.spec
+++ b/libwmf.spec
@@ -1,11 +1,12 @@
 Summary: Windows Metafile Library
 Name: libwmf
 Version: 0.2.8.4
-Release: 12
+Release: 13%{?dist}
 Group: System Environment/Libraries
 License: LGPL
-Source: http://prdownloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Source: http://downloads.sourceforge.net/wvware/%{name}-%{version}.tar.gz
+URL: http://wvware.sourceforge.net/libwmf.html
+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: libwmf-0.2.8.3-nodocs.patch
 Patch1: libwmf-0.2.8.3-relocatablefonts.patch
 Patch2: libwmf-0.2.8.4-fallbackfont.patch
@@ -13,20 +14,10 @@ Patch3: libwmf-0.2.8.4-deps.patch
 Patch4: libwmf-0.2.8.4-multiarchdevel.patch
 Patch5: libwmf-0.2.8.4-intoverflow.patch
 Patch6: libwmf-0.2.8.4-reducesymbols.patch
-Requires: gtk2 >= 2.9.0
-Requires: libxml2 >= 2.6.8
-Requires: gd >= 2.0.21
 Requires(post): %{_bindir}/update-gdk-pixbuf-loaders
 Requires(postun): %{_bindir}/update-gdk-pixbuf-loaders
-BuildRequires: gtk2-devel
-BuildRequires: libtool
-BuildRequires: libxml2-devel
-BuildRequires: gd-devel
-BuildRequires: libpng-devel
-BuildRequires: libjpeg-devel
-BuildRequires: automake14
-BuildRequires: libXt-devel
-BuildRequires: libX11-devel
+BuildRequires: gtk2-devel, libtool, libxml2-devel, gd-devel, libpng-devel
+BuildRequires: libjpeg-devel, automake14, libXt-devel, libX11-devel, dos2unix
 
 %description
 A library for reading and converting Windows MetaFile vector graphics (WMF)
@@ -35,13 +26,11 @@ A library for reading and converting Windows MetaFile vector graphics (WMF)
 Summary: Support files necessary to compile applications with libwmf
 Group: Development/Libraries
 Requires: libwmf = %{version}-%{release}
-Requires: gtk2-devel
-Requires: libxml2-devel
-Requires: gd-devel
-Requires: libjpeg-devel
+Requires: gtk2-devel, libxml2-devel, gd-devel, libjpeg-devel, pkgconfig
 
 %description devel
-Libraries, headers, and support files necessary to compile applications using libwmf.
+Libraries, headers, and support files necessary to compile applications 
+using libwmf.
 
 %prep
 %setup -q
@@ -59,14 +48,16 @@ libtoolize --force --copy
 aclocal-1.4
 autoconf
 automake-1.4 -a
-%configure --with-libxml2
+%configure --with-libxml2 --disable-static
 export tagname=CC
 make LIBTOOL=/usr/bin/libtool %{?_smp_mflags}
+dos2unix doc/caolan/*.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-%makeinstall LIBTOOL=/usr/bin/libtool
+make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
+rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/*/loaders/*.la
@@ -82,7 +73,7 @@ find doc -name "Makefile*" -exec rm {} \;
 %{_bindir}/update-gdk-pixbuf-loaders %{_host} &>/dev/null || :
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/lib*.so.*
 %{_libdir}/gtk-2.0/*/loaders/*.so
@@ -95,13 +86,12 @@ find doc -name "Makefile*" -exec rm {} \;
 %{_datadir}/libwmf
 
 %files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc doc/*.html
 %doc doc/*.png
 %doc doc/*.gif
 %doc doc/html
 %doc doc/caolan
-%{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libwmf.pc
 %{_includedir}/libwmf
@@ -111,6 +101,9 @@ find doc -name "Makefile*" -exec rm {} \;
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Feb 09 2007 Caolan McNamara <caolanm@redhat.com> 0.2.8.4-13
+- Resolves: rhbz#222734 no need for Makefiles in doc dirs
+
 * Tue Jan 16 2007 Caolan McNamara <caolanm@redhat.com> 0.2.8.4-12
 - Resolves: rhbz#222734 no need for Makefiles in doc dirs
 
@@ -146,7 +139,7 @@ rm -r $RPM_BUILD_ROOT
 - rebuilt for new gcc4.1 snapshot and glibc changes
 
 * Tue Jan 19 2006 Caolan McNamara <caolanm@redhat.com> 0.2.8.4-4
-- rh#178275# match srvg gtk2 %{_host} usage for pixbuf loaders
+- rh#178275# match srvg gtk2 _host usage for pixbuf loaders
 
 * Tue Jan 03 2006 Caolan McNamara <caolanm@redhat.com> 0.2.8.4-3
 - add libwmf-0.2.8.4-fallbackfont.patch for rh#176620#