diff --git a/libgpg-error.changes b/libgpg-error.changes
index 06f724c..b2fe6be 100644
--- a/libgpg-error.changes
+++ b/libgpg-error.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 12 21:31:41 UTC 2012 - crrodriguez@opensuse.org
+
+- Move libraries back to %{_libdir}, /usr merge project
+
 -------------------------------------------------------------------
 Sat Nov 19 15:56:17 UTC 2011 - coolo@suse.com
 
diff --git a/libgpg-error.spec b/libgpg-error.spec
index aee0f97..9450ad5 100644
--- a/libgpg-error.spec
+++ b/libgpg-error.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libgpg-error
 #
-# 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,14 +16,13 @@
 #
 
 
-
 Name:           libgpg-error
 Version:        1.10
-Release:        1
-License:        GPL-2.0+ ; LGPL-2.1+
+Release:        0
 Summary:        Library That Defines Common Error Values for All GnuPG Components
-Url:            http://www.gnupg.org/
+License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
+Url:            http://www.gnupg.org/
 Source:         %name-%version.tar.bz2
 Source2:        baselibs.conf
 # rename package to "libgpg-error-nld" and set this to 1 for NLD
@@ -38,8 +37,8 @@ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon, and possibly more in the future.
 
 %package -n libgpg-error0
-License:        GPL-2.0+ ; LGPL-2.1+
 Summary:        Library That Defines Common Error Values for All GnuPG Components
+License:        GPL-2.0+ ; LGPL-2.1+
 Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
@@ -55,8 +54,8 @@ components.  Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt,
 pinentry, SmartCard Daemon, and possibly more in the future.
 
 %package devel
-License:        GPL-2.0+ ; LGPL-2.1+ ; MIT
 Summary:        Development package for libgpg-error
+License:        GPL-2.0+ ; LGPL-2.1+ ; MIT
 Group:          Development/Libraries/C and C++
 # bug437293
 %ifarch ppc64
@@ -80,15 +79,12 @@ Files needed for software development using libgpg-error.
 
 %build
 autoreconf -fiv
-%configure --disable-static --with-pic --libdir=/%{_lib}
+%configure --disable-static --with-pic
 make %{?_smp_mflags}
 
 %install
 %make_install
-rm %{buildroot}/%{_lib}/libgpg-error.la
-mkdir -p %{buildroot}%{_libdir}
-ln -s -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
-rm -v %{buildroot}/%{_lib}/%{name}.so
+rm %{buildroot}%{_libdir}/libgpg-error.la
 # Drop the lisp stuff, it depends on ASDF and CFFI
 # which needs to be packaged first
 rm -r %{buildroot}%{_datadir}/common-lisp
@@ -103,7 +99,7 @@ rm -rf %{buildroot}
 
 %files -n libgpg-error0 -f %{name}.lang
 %defattr(-,root,root)
-/%{_lib}/libgpg-error*.so.*
+%{_libdir}/libgpg-error*.so.*
 
 %files devel
 %defattr(-,root,root)