diff --git a/popt.changes b/popt.changes
index 97da57a..7da42d0 100644
--- a/popt.changes
+++ b/popt.changes
@@ -2,8 +2,6 @@
 Wed Feb  2 08:35:00 UTC 2011 - andreas.hanke@gmx-topmail.de
 
 - don't build libpopt.a
-- move libpopt.so from /%{_lib} to %{_libdir} and fix popt.pc to have
-  libdir=%{_libdir} instead of libdir=/%{_lib}
 - don't list popt.mo files twice
 
 -------------------------------------------------------------------
diff --git a/popt.spec b/popt.spec
index 86dca3a..1ab3cc1 100644
--- a/popt.spec
+++ b/popt.spec
@@ -69,15 +69,13 @@ API documentation of the popt library, too.
 %setup -q
 
 %build
-%configure --disable-static
+%configure --libdir=/%{_lib} --disable-static
 make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_libdir}/libpopt.{la,so}
-install -d -m755 $RPM_BUILD_ROOT/%{_lib}
-mv $RPM_BUILD_ROOT%{_libdir}/libpopt.so.* $RPM_BUILD_ROOT/%{_lib}
-ln -s /%{_lib}/libpopt.so.0 $RPM_BUILD_ROOT%{_libdir}/libpopt.so
+rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a
+rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
 %if "%{_libdir}" != "%{_prefix}/lib"
 install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
 mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
@@ -99,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root)
 %doc README
-%{_libdir}/libpopt.so
+/%{_lib}/libpopt.so
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
 %{_libdir}/pkgconfig/popt.pc