diff --git a/libidn.spec b/libidn.spec
index 750df25..07d1b24 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -50,7 +50,7 @@ iconv -f ISO-8859-1 -t UTF-8 doc/libidn.info > iconv.tmp
 mv iconv.tmp doc/libidn.info
 
 %build
-%configure --disable-csharp --disable-static --libdir=/%{_lib} --with-lispdir=%{_emacs_sitelispdir}/%{name}
+%configure --disable-csharp --disable-static --with-lispdir=%{_emacs_sitelispdir}/%{name}
 make %{?_smp_mflags} V=1
 
 %check
@@ -69,19 +69,9 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/info/dir
 # Make multilib safe:
 sed -i '/gnu compiler/d' $RPM_BUILD_ROOT%{_includedir}/idn-int.h
 
-rm -f $RPM_BUILD_ROOT/%{_lib}/*.la \
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la \
       $RPM_BUILD_ROOT%{_datadir}/info/*.png
 
-mkdir -p $RPM_BUILD_ROOT%{_libdir}
-mv $RPM_BUILD_ROOT/%{_lib}/libidn.so $RPM_BUILD_ROOT%{_libdir}
-
-lib=`echo $RPM_BUILD_ROOT/%{_lib}/libidn.so.*.*`
-ln -sf ../../%{_lib}/`basename ${lib}` $RPM_BUILD_ROOT%{_libdir}/libidn.so
-
-# Fix the .pc file to reference the directory which contains the .so
-sed -i 's,^libdir=.*$,libdir=%{_libdir},' \
-    $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libidn.pc
-
 %{_emacs_bytecompile} $RPM_BUILD_ROOT%{_emacs_sitelispdir}/%{name}/*.el
 
 %find_lang %{name}
@@ -101,7 +91,7 @@ fi
 %doc AUTHORS NEWS FAQ README THANKS COPYING*
 %{_bindir}/idn
 %{_mandir}/man1/idn.1*
-/%{_lib}/libidn.so.*
+%{_libdir}/libidn.so.*
 %{_infodir}/%{name}.info.gz
 
 %files devel