diff --git a/libxml2.changes b/libxml2.changes
index ab1ae32..b3c0d7f 100644
--- a/libxml2.changes
+++ b/libxml2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Sep 21 18:04:16 UTC 2012 - jengelh@inai.de
+
+- Remove .la files; make sure installation succeeds for
+  Fedora_17 target
+
 -------------------------------------------------------------------
 Tue Jun 12 18:10:07 UTC 2012 - chris@computersalat.de
 
diff --git a/libxml2.spec b/libxml2.spec
index 124dfbb..44a1f09 100644
--- a/libxml2.spec
+++ b/libxml2.spec
@@ -123,12 +123,13 @@ The library also supports RelaxNG. Support for W3C XML Schemas is in
 progress.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 %patch0
 
 %build
 %configure --disable-static \
-    --with-html-subdir=packages/%{name}/html \
+    --docdir=%_docdir/%name \
+    --with-html-dir=%_docdir/%name/html \
     --with-fexceptions \
     --with-history \
     --without-python \
@@ -139,10 +140,12 @@ progress.
     --with-reader \
     --with-http
 
-make %{?_smp_mflags} DOC_MODULE=packages/%{name}
+make %{?_smp_mflags} BASE_DIR="%_docdir" DOC_MODULE="%name"
 
 %install
-%makeinstall DOC_MODULE=packages/%{name}
+make install DESTDIR="%buildroot" BASE_DIR="%_docdir" DOC_MODULE="%name"
+rm -f "%buildroot/%_libdir"/*.la
+mkdir -p "%buildroot/%_docdir/%name"
 cp -a AUTHORS NEWS README COPYING* Copyright TODO* %{buildroot}%{_docdir}/%{name}/
 ln -s libxml2/libxml %{buildroot}%{_includedir}/libxml
 
@@ -177,7 +180,6 @@ make check
 %{_includedir}/libxml
 %{_includedir}/libxml2
 %{_libdir}/lib*.so
-%{_libdir}/libxml2.la
 %{_libdir}/*.sh
 %{_libdir}/pkgconfig/*.pc
 %doc %{_mandir}/man1/xml2-config.1*