diff --git a/popt.changes b/popt.changes
index b59be2b..7e0a0fa 100644
--- a/popt.changes
+++ b/popt.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 12 21:38:30 UTC 2012 - crrodriguez@opensuse.org
+
+- Libraries back into %{_libdir}, /usr merge project. 
+
 -------------------------------------------------------------------
 Sun Oct  9 11:09:27 UTC 2011 - jengelh@medozas.de
 
diff --git a/popt.spec b/popt.spec
index 92344f9..b8001c9 100644
--- a/popt.spec
+++ b/popt.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package popt
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,18 @@
 #
 
 
-
 Name:           popt
 Version:        1.16
-Release:        7
+Release:        0
 #!BuildIgnore:  rpmlint-Factory
-License:        MIT
 Summary:        A C library for parsing command line parameters
+License:        MIT
 Group:          System Environment/Libraries
-URL:            http://www.rpm5.org/
+Url:            http://www.rpm5.org/
 Source:         popt-%{version}.tar.bz2
 Source2:        baselibs.conf
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  pkgconfig
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Popt is a C library for parsing command line parameters.  Popt was
@@ -40,10 +39,9 @@ be aliased via configuration files and includes utility functions for
 parsing arbitrary strings into argv[] arrays using shell-like rules.
 
 %package -n libpopt0
-License:        MIT
 Summary:        A C library for parsing command line parameters
 Group:          System Environment/Libraries
-Provides:       popt = %{version}-%{release}
+Provides:       popt = %{version}
 Obsoletes:      popt < %{version}
 
 %description -n libpopt0
@@ -56,7 +54,6 @@ be aliased via configuration files and includes utility functions for
 parsing arbitrary strings into argv[] arrays using shell-like rules.
 
 %package devel
-License:        MIT
 Summary:        Development files for the popt library
 Group:          Development/Libraries
 Requires:       libpopt0 = %{version}
@@ -68,37 +65,37 @@ API documentation of the popt library, too.
 
 %prep
 %setup -q
-
 %build
-%configure --libdir=/%{_lib} --disable-static
+%configure --with-pic --disable-static
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
+%make_install
+rm %{buildroot}%{_libdir}/libpopt.la
+
 %if "%{_libdir}" != "%{_prefix}/lib"
 install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
 mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
 %endif
-%find_lang %name
+
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -n libpopt0 -p /sbin/ldconfig
 
 %postun -n libpopt0 -p /sbin/ldconfig
 
-%files -n libpopt0 -f %name.lang
+%files -n libpopt0 -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGES COPYING
-/%{_lib}/libpopt.so.*
+%{_libdir}/libpopt.so.*
 
 %files devel
 %defattr(-,root,root)
 %doc README
-/%{_lib}/libpopt.so
+%{_libdir}/libpopt.so
 %{_includedir}/popt.h
 %{_mandir}/man3/popt.3*
 %{_libdir}/pkgconfig/popt.pc