diff --git a/libxml2-multilib.patch b/libxml2-multilib.patch
new file mode 100644
index 0000000..138d38f
--- /dev/null
+++ b/libxml2-multilib.patch
@@ -0,0 +1,24 @@
+*** XML/xml2-config.in.orig	2006-06-06 16:35:56.000000000 +0200
+--- XML/xml2-config.in	2006-06-06 16:36:24.000000000 +0200
+***************
+*** 3,9 ****
+  prefix=@prefix@
+  exec_prefix=@exec_prefix@
+  includedir=@includedir@
+! libdir=@libdir@
+  
+  usage()
+  {
+--- 3,14 ----
+  prefix=@prefix@
+  exec_prefix=@exec_prefix@
+  includedir=@includedir@
+! if [ "`ldd /bin/sh | grep lib64`" = "" ]
+! then
+!     libdir=${exec_prefix}/lib
+! else
+!     libdir=${exec_prefix}/lib64
+! fi
+  
+  usage()
+  {
diff --git a/libxml2.spec b/libxml2.spec
index 6e38a48..243a8e6 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -1,16 +1,14 @@
 Summary: Library providing XML and HTML support
 Name: libxml2
 Version: 2.6.32
-Release: 2%{?dist}%{?extra_release}
+Release: 3%{?dist}%{?extra_release}
 License: MIT
 Group: Development/Libraries
 Source: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: python python-devel zlib-devel
 URL: http://xmlsoft.org/
-Prefix: %{_prefix}
-Docdir: %{_docdir}
-Patch0: multilib.patch
+Patch0: libxml2-multilib.patch
 
 %description
 This library allows to manipulate XML files. It includes support 
@@ -42,6 +40,15 @@ to select subnodes or ranges. A flexible Input/Output mechanism is
 available, with existing HTTP and FTP modules and combined to an
 URI library.
 
+%package static
+Summary: Static library for libxml2
+Group: Development/Libraries
+Requires: libxml2 = %{version}-%{release}
+
+%description static
+Static library for libxml2 provided for specific uses or shaving a few
+microseconds when parsing, do not link to them for generic purpose packages.
+
 %package python
 Summary: Python bindings for the libxml2 library
 Group: Development/Libraries
@@ -63,7 +70,7 @@ at parse time or later once the document has been modified.
 
 %build
 %configure
-make
+make %{_smp_mflags}
 gzip -9 ChangeLog
 
 %install
@@ -74,17 +81,15 @@ gzip -9 doc/libxml2-api.xml
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 
 # multiarch crazyness on timestamp differences or Makefile/binaries for examples
-touch -m --reference=$RPM_BUILD_ROOT/%{prefix}/include/libxml2/libxml/parser.h $RPM_BUILD_ROOT/%{prefix}/bin/xml2-config
+touch -m --reference=$RPM_BUILD_ROOT/%{_includedir}/libxml2/libxml/parser.h $RPM_BUILD_ROOT/%{_bindir}/xml2-config
 (cd doc/examples ; make clean ; rm -rf .deps Makefile)
 
 %clean
 rm -fr %{buildroot}
 
-%post
-/sbin/ldconfig
+%post -p /sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %files
 %defattr(-, root, root)
@@ -95,14 +100,13 @@ rm -fr %{buildroot}
 %doc %{_mandir}/man3/libxml.3*
 
 %{_libdir}/lib*.so.*
-%{prefix}/bin/xmllint
-%{prefix}/bin/xmlcatalog
+%{_bindir}/xmllint
+%{_bindir}/xmlcatalog
 
 %files devel
 %defattr(-, root, root)
 
 %doc %{_mandir}/man1/xml2-config.1*
-%doc AUTHORS ChangeLog.gz NEWS README Copyright TODO
 %doc doc/*.html doc/html doc/*.gif doc/*.png
 %doc doc/tutorial doc/libxml2-api.xml.gz
 %doc doc/examples
@@ -113,16 +117,20 @@ rm -fr %{buildroot}
 %doc %{_datadir}/gtk-doc/html/libxml2/*.css
 
 %{_libdir}/lib*.so
-%{_libdir}/*a
 %{_libdir}/*.sh
-%{prefix}/include/*
-%{prefix}/bin/xml2-config
-%{prefix}/share/aclocal/libxml.m4
+%{_includedir}/*
+%{_bindir}/xml2-config
+%{_datadir}/aclocal/libxml.m4
 %{_libdir}/pkgconfig/libxml-2.0.pc
+
+%files static
+%defattr(-, root, root)
+
+%{_libdir}/*a
+
 %files python
 %defattr(-, root, root)
 
-%doc AUTHORS ChangeLog.gz NEWS README Copyright
 %{_libdir}/python*/site-packages/libxml2.py*
 %{_libdir}/python*/site-packages/drv_libxml2.py*
 %{_libdir}/python*/site-packages/libxml2mod*
@@ -133,6 +141,10 @@ rm -fr %{buildroot}
 %doc doc/python.html
 
 %changelog
+* Fri May 30 2008 Daniel Veillard <veillard@redhat.com> 2.6.31-3.fc10
+- cleanup based on Fedora packaging guidelines, should fix #226079
+- separate a -static package
+
 * Thu May 15 2008 Daniel Veillard <veillard@redhat.com> 2.6.31-2.fc10
 - try to fix multiarch problems like #440206
 
diff --git a/multilib.patch b/multilib.patch
deleted file mode 100644
index 138d38f..0000000
--- a/multilib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-*** XML/xml2-config.in.orig	2006-06-06 16:35:56.000000000 +0200
---- XML/xml2-config.in	2006-06-06 16:36:24.000000000 +0200
-***************
-*** 3,9 ****
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  includedir=@includedir@
-! libdir=@libdir@
-  
-  usage()
-  {
---- 3,14 ----
-  prefix=@prefix@
-  exec_prefix=@exec_prefix@
-  includedir=@includedir@
-! if [ "`ldd /bin/sh | grep lib64`" = "" ]
-! then
-!     libdir=${exec_prefix}/lib
-! else
-!     libdir=${exec_prefix}/lib64
-! fi
-  
-  usage()
-  {