diff --git a/libnscd.changes b/libnscd.changes
index 6c7fe07..a5d5c4a 100644
--- a/libnscd.changes
+++ b/libnscd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Feb  7 05:31:45 UTC 2012 - crrodriguez@opensuse.org
+
+- put library back into %{_libdir} , /usr merge.
+
 -------------------------------------------------------------------
 Sun Oct 31 12:37:02 UTC 2010 - jengelh@medozas.de
 
diff --git a/libnscd.spec b/libnscd.spec
index 4584a73..1e1e30a 100644
--- a/libnscd.spec
+++ b/libnscd.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libnscd (Version 2.0.2)
+# spec file for package libnscd
 #
-# Copyright (c) 2010 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
@@ -15,21 +15,18 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           libnscd
-License:        LGPLv2.1
-Group:          System/Libraries
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      libnscd-64bit
 %endif
 #
 Version:        2.0.2
-Release:        116
+Release:        0
 Summary:        Library to Allow Applications to Communicate with nscd
+License:        LGPL-2.1
+Group:          System/Libraries
 Source:         libnscd-%{version}.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -42,11 +39,10 @@ for special services, if they have the necessary permissions.
 
 
 %package devel
-License:        LGPLv2.1+
 Summary:        Include Files and Libraries for Development.
+License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
 Requires:       libnscd = %{version}
-AutoReqProv:    on
 # bug437293
 %ifarch ppc64
 Obsoletes:      libnscd-devel-64bit
@@ -63,7 +59,7 @@ to develop applications that needs to communicate with a running nscd.
 %setup -q
 
 %build
-%configure --libdir=/%{_lib} --disable-static --with-pic
+%configure --disable-static --with-pic
 %{__make} %{?_smp_mflags}
 
 %check
@@ -72,8 +68,7 @@ make check
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 %{__mkdir_p} %{buildroot}%{_libdir}
-%{__ln_s} -v /%{_lib}/$(readlink %{buildroot}/%{_lib}/%{name}.so) %{buildroot}%{_libdir}/%{name}.so
-%{__rm} -v %{buildroot}/%{_lib}/%{name}.{so,la}
+rm -fv %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -85,7 +80,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc COPYING.LIB README NEWS
-/%{_lib}/libnscd.so.*
+%{_libdir}/libnscd.so.*
 
 %files devel
 %defattr(-,root,root)