diff --git a/baselibs.conf b/baselibs.conf
index 0280cae..78a380f 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1,3 @@
-libnscd
+libnscd1
+	obsoletes "libnscd-<targettype> < <version>"
+	provides "libnscd-<targettype> = <version>"
diff --git a/libnscd.changes b/libnscd.changes
index a5d5c4a..cc8547f 100644
--- a/libnscd.changes
+++ b/libnscd.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jul  6 16:51:11 UTC 2013 - jengelh@inai.de
+
+- Implement shlib package naming guidelines
+- Remove redundant %clean section
+
 -------------------------------------------------------------------
 Tue Feb  7 05:31:45 UTC 2012 - crrodriguez@opensuse.org
 
diff --git a/libnscd.spec b/libnscd.spec
index 1e1e30a..5e73543 100644
--- a/libnscd.spec
+++ b/libnscd.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libnscd
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -17,32 +17,44 @@
 
 
 Name:           libnscd
-# bug437293
-%ifarch ppc64
-Obsoletes:      libnscd-64bit
-%endif
-#
+%define lname	libnscd1
 Version:        2.0.2
 Release:        0
 Summary:        Library to Allow Applications to Communicate with nscd
 License:        LGPL-2.1
-Group:          System/Libraries
-Source:         libnscd-%{version}.tar.bz2
+Group:          Development/Libraries/C and C++
+
+Source:         http://ftp.suse.com/pub/people/kukuk/libnscd/libnscd-%version.tar.bz2
 Source2:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# bug437293
+%ifarch ppc64
+Obsoletes:      libnscd-64bit
+%endif
 
 %description
 This library provides an interface for applications to NSCD (Name
 Service Cache Daemon) and allows those applications, to flush the cache
 for special services, if they have the necessary permissions.
 
+%package -n %lname
+Summary:        Library to Allow Applications to Communicate with nscd
+License:        LGPL-2.1
+Group:          System/Libraries
+# O/P added for 13.1
+Obsoletes:      libnscd < %version-%release
+Provides:       libnscd = %version-%release
 
+%description -n %lname
+This library provides an interface for applications to NSCD (Name
+Service Cache Daemon) and allows those applications, to flush the
+cache for special services, if they have the necessary permissions.
 
 %package devel
-Summary:        Include Files and Libraries for Development.
+Summary:        Include Files and Libraries for Development
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Requires:       libnscd = %{version}
+Requires:       %lname = %version
 # bug437293
 %ifarch ppc64
 Obsoletes:      libnscd-devel-64bit
@@ -70,14 +82,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 %{__mkdir_p} %{buildroot}%{_libdir}
 rm -fv %{buildroot}%{_libdir}/*.la
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post   -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
+%files -n %lname
 %defattr(-,root,root)
 %doc COPYING.LIB README NEWS
 %{_libdir}/libnscd.so.*