diff --git a/baselibs.conf b/baselibs.conf
index b3ff0e3..38d1af7 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libmikmod
+libmikmod2
diff --git a/libmikmod.changes b/libmikmod.changes
index e2c46fc..f774f12 100644
--- a/libmikmod.changes
+++ b/libmikmod.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun 11 15:53:41 UTC 2012 - jengelh@inai.de
+
+- Adhere to shlib package naming guidelines
+- Parallel build with %_smp_mflags
+- Remove redundant tags/sections from specfile
+
 -------------------------------------------------------------------
 Sat Nov 19 20:41:22 UTC 2011 - coolo@suse.com
 
diff --git a/libmikmod.spec b/libmikmod.spec
index 2fedfee..d3b87dc 100644
--- a/libmikmod.spec
+++ b/libmikmod.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libmikmod
 #
-# 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
@@ -15,22 +15,17 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           libmikmod
-BuildRequires:  esound-devel libtool
+%define lname	libmikmod2
+BuildRequires:  esound-devel
+BuildRequires:  libtool
 Url:            http://mikmod.raphnet.net/
-License:        LGPL-2.1+
-Group:          System/Libraries
 Summary:        MikMod Sound Library
+License:        LGPL-2.1+
+Group:          Development/Libraries/C and C++
 Version:        3.1.12
-Release:        8
-# bug437293
-%ifarch ppc64
-Obsoletes:      libmikmod-64bit
-%endif
-#
+Release:        0
 Source:         %{name}-%{version}.tar.bz2
 Source1:        %{name}-rpmlintrc
 Source2:        baselibs.conf
@@ -52,13 +47,31 @@ well as module files. It was originally written by Jean-Paul Mikkers
 also write wav files. Supported file formats include mod, stm, s3m,
 mtm, xm, and it.
 
+%package -n %lname
+Summary:        MikMod Sound Library
+Group:          System/Libraries
+# bug437293
+%ifarch ppc64
+Obsoletes:      libmikmod-64bit
+%endif
+#
+# O/P added 2012-06-11
+Provides:       libmikmod = %version-%release
+Obsoletes:      libmikmod < %version-%release
 
+%description -n %lname
+Libmikmod is a portable sound library, capable of playing samples as
+well as module files. It was originally written by Jean-Paul Mikkers
+(MikMak) for DOS. It supports OSS /dev/dsp, ALSA, and Esound and can
+also write wav files. Supported file formats include mod, stm, s3m,
+mtm, xm, and it.
 
 %package devel
-License:        LGPL-2.1+
-Group:          Development/Libraries/C and C++
 Summary:        Development files for MikMod Sound Library
-Requires:       %{name} = %{version} glibc-devel audiofile-devel
+Group:          Development/Libraries/C and C++
+Requires:       %lname = %version
+Requires:       audiofile-devel
+Requires:       glibc-devel
 PreReq:         %install_info_prereq
 # bug437293
 %ifarch ppc64
@@ -93,7 +106,7 @@ mtm, xm, and it.
 %build
 autoreconf -f -i
 %configure --disable-static --with-pic
-%{__make} %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
 %makeinstall
@@ -101,12 +114,9 @@ cmp   $RPM_BUILD_ROOT%{_includedir}/mikmod{,_build}.h &&
 ln -f $RPM_BUILD_ROOT%{_includedir}/mikmod{,_build}.h
 %{__rm} -f %{buildroot}%{_libdir}/*.la
 
-%clean 
-rm -rf $RPM_BUILD_ROOT
+%post -n %lname -p /sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz
@@ -114,13 +124,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun devel
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/mikmod.info.gz
 
-%files
+%files -n %lname
 %defattr(-,root,root)
-%doc README AUTHORS COPYING.LIB NEWS TODO COPYING.LESSER
-%{_libdir}/libmikmod.so.*
+%doc COPYING.LIB COPYING.LESSER
+%{_libdir}/libmikmod.so.2*
 
 %files devel
 %defattr(-,root,root)
+%doc README AUTHORS NEWS TODO
 %{_bindir}/*-config
 %{_datadir}/aclocal/libmikmod.m4
 %{_includedir}/*