diff --git a/xz.changes b/xz.changes
index e73448e..9a41c82 100644
--- a/xz.changes
+++ b/xz.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Jun  7 19:39:45 CEST 2009 - crrodriguez@suse.de
+
+- remove static libraries, see bnc#509945 for details 
+
 -------------------------------------------------------------------
 Sun Feb 22 18:37:26 CET 2009 - ro@suse.de
 
diff --git a/xz.spec b/xz.spec
index 2b8ca40..f718140 100644
--- a/xz.spec
+++ b/xz.spec
@@ -20,7 +20,7 @@
 Name:           xz
 Summary:        A Program for Compressing Files
 Version:        4.999.8beta
-Release:        4
+Release:        5
 Group:          Productivity/Archiving/Compression
 License:        GPL v2 or later
 Url:            http://tukaani.org/lzma/
@@ -102,17 +102,15 @@ Authors:
 
 %build
 AUTOPOINT=true autoreconf -fi
-./configure CFLAGS="$RPM_OPT_FLAGS" \
-	    --prefix=/usr --libdir=%{_libdir} --mandir=%{_mandir}
+%configure --libdir=/%{_lib} --disable-static --with-pic
 make %{?jobs:-j%jobs}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/%{_lib}
-mv $RPM_BUILD_ROOT%{_libdir}/liblzma.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/liblzma.so.0 $RPM_BUILD_ROOT%{_libdir}/liblzma.so
-#empty dependency_libs
-rm -f $RPM_BUILD_ROOT/%{_lib}/*.la
+%{__mkdir_p} %{buildroot}%{_libdir}
+%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/liblzma.so) %{buildroot}%{_libdir}/liblzma.so
+%{__mv} -v  %{buildroot}/%{_lib}/pkgconfig %{buildroot}%{_libdir}
+%{__rm} -v %{buildroot}/%{_lib}/liblzma.{so,la}
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -136,10 +134,11 @@ rm -fr $RPM_BUILD_ROOT
 %{_includedir}/*.h
 %{_includedir}/lzma
 %{_libdir}/lib*.so
-%{_libdir}/lib*.*a
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Jun 07 2009 crrodriguez@suse.de
+- remove static libraries, see bnc#509945 for details
 * Sun Feb 22 2009 ro@suse.de
 - added baselibs.conf (for rpm-32bit)
 * Mon Feb 16 2009 coolo@suse.de