diff --git a/baselibs.conf b/baselibs.conf
index b7ee9b8..23efa16 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1 +1 @@
-libmng
+libmng1
diff --git a/libmng.changes b/libmng.changes
index ba0aa14..7dc4283 100644
--- a/libmng.changes
+++ b/libmng.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Feb  1 11:19:24 UTC 2012 - idonmez@suse.com
+
+- Remove contrib directory during build, its unused and might
+  confuse licensing, bnc#744320
+
+-------------------------------------------------------------------
+Mon Nov 21 17:59:42 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant/unwanted tags/section (cf. specfile guidelines)
+- Use %_smp_mflags for parallel building
+- Do shlib policy packaging
+
 -------------------------------------------------------------------
 Sat Feb 13 08:25:24 UTC 2010 - adrian@suse.de
 
diff --git a/libmng.spec b/libmng.spec
index 282ce0d..3d73144 100644
--- a/libmng.spec
+++ b/libmng.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package libmng (Version 1.0.10)
+# spec file for package libmng
 #
-# 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,25 +15,26 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           libmng
-BuildRequires:  libjpeg-devel liblcms-devel zlib-devel
-License:        GPLv2+ ; Other uncritical OpenSource License
-Group:          System/Libraries
-Summary:        Library for Support of MNG and JNG Formats
 Version:        1.0.10
-Release:        93
+Release:        0
+Summary:        Library for Support of MNG and JNG Formats
+License:        Zlib
+Group:          Development/Libraries/C and C++
+%define lname	libmng1
+BuildRequires:  libjpeg-devel
+BuildRequires:  liblcms-devel
+BuildRequires:  zlib-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      libmng-64bit
 %endif
 #
 Url:            http://www.libmng.com/
-Source0:        libmng-%version.tar.bz2
+Source0:        libmng-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch:          libmng.diff
+Patch1:         libmng.diff
 Patch2:         libmng-no-jpeg.diff
 Patch3:         libmng-1.0.9-dont-leak-zlib-streams.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -42,17 +43,24 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 This library can handle MNG and JNG formats that contain animated
 pictures. These formats should replace the GIF format.
 
+%package -n %lname
+Summary:        Library for Support of MNG and JNG Formats
+Group:          System/Libraries
+# O/P added 2011-11-29
+Obsoletes:      libmng < %{version}-%{release}
+Provides:       libmng = %{version}-%{release}
 
-
-Authors:
---------
-    Gerard Juyn <gerard@libmng.com>
+%description -n %lname
+This library can handle MNG and JNG formats that contain animated
+pictures. These formats should replace the GIF format.
 
 %package devel
-License:        GPLv2+ ; Other uncritical OpenSource License
-Requires:       libjpeg-devel %{name} = %{version} liblcms-devel zlib-devel
-Summary:        Include Files and Libraries mandatory for Development.
+Summary:        Include Files and Libraries mandatory for Development
 Group:          Development/Libraries/C and C++
+Requires:       %lname = %{version}
+Requires:       libjpeg-devel
+Requires:       liblcms-devel
+Requires:       zlib-devel
 # bug437293
 %ifarch ppc64
 Obsoletes:      libmng-devel-64bit
@@ -65,48 +73,46 @@ pictures. These formats should replace the GIF format.
 
 This package contains the static library and the header files.
 
-
-
-Authors:
---------
-    Gerard Juyn <gerard@libmng.com>
-
 %prep
 %setup -q
-%patch
+%patch1
 %patch3
 
 %build
-make %{?jobs:-j%jobs} -f makefiles/makefile.linux _LIB=%_lib
+
+# This is not zlib licensed and unused, just as a caution, bnc#744320
+rm -rf contrib
+
+make %{?_smp_mflags} -f makefiles/makefile.linux _LIB=%{_lib}
 
 %install
-make -f makefiles/makefile.linux DESTDIR=$RPM_BUILD_ROOT _LIB=%_lib install
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man3/ $RPM_BUILD_ROOT/%{_mandir}/man5/
-install -m 0644 doc/man/*.3 $RPM_BUILD_ROOT/%{_mandir}/man3/
-install -m 0644 doc/man/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5/
+make -f makefiles/makefile.linux DESTDIR=%{buildroot} _LIB=%{_lib} install
+mkdir -p %{buildroot}/%{_mandir}/man3/ %{buildroot}/%{_mandir}/man5/
+install -m 0644 doc/man/*.3 %{buildroot}/%{_mandir}/man3/
+install -m 0644 doc/man/*.5 %{buildroot}/%{_mandir}/man5/
 #
 # build a mini libmng
 #
 make -f makefiles/makefile.linux clean
-patch -p0 < %PATCH2
-make -f makefiles/makefile.linux _LIB=%_lib
-install -m 0755 libmng.a $RPM_BUILD_ROOT/%_libdir/libmng-mini.a
-%{__rm} -v %{buildroot}%_libdir/libmng.a
+patch -p0 < %{PATCH2}
+make -f makefiles/makefile.linux _LIB=%{_lib}
+install -m 0644 libmng.a %{buildroot}/%{_libdir}/libmng-mini.a
+rm -v %{buildroot}%{_libdir}/libmng.a
 
-%post -p /sbin/ldconfig
+%post -n %lname -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
 
-%files
+%files -n %lname
 %defattr(-,root,root)
 %doc LICENSE README doc/doc.readme doc/libmng.txt
 %{_libdir}/libmng.so.*
 
 %files devel
 %defattr(-,root,root)
-/usr/include/*.h
-%doc %_mandir/*/*
-%_libdir/libmng-mini.a
-%_libdir/libmng.so
+%{_includedir}/*.h
+%doc %{_mandir}/*/*
+%{_libdir}/libmng-mini.a
+%{_libdir}/libmng.so
 
 %changelog