diff --git a/mingw64-winpthreads.changes b/mingw64-winpthreads.changes
index d9ab916..10f4205 100644
--- a/mingw64-winpthreads.changes
+++ b/mingw64-winpthreads.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 14 10:47:35 UTC 2014 - jengelh@inai.de
+
+- Implement shlib package naming guidelines
+
 -------------------------------------------------------------------
 Mon Feb  3 12:07:45 UTC 2014 - jengelh@inai.de
 
diff --git a/mingw64-winpthreads.spec b/mingw64-winpthreads.spec
index a0ae12a..c4900d7 100644
--- a/mingw64-winpthreads.spec
+++ b/mingw64-winpthreads.spec
@@ -16,13 +16,14 @@
 #
 
 
-%define __strip %{_mingw64_strip}
-%define __objdump %{_mingw64_objdump}
+%define __strip %_mingw64_strip
+%define __objdump %_mingw64_objdump
 %define _use_internal_dependency_generator 0
-%define __find_requires %{_mingw64_findrequires}
-%define __find_provides %{_mingw64_findprovides}
-%define __os_install_post %{_mingw64_debug_install_post} \
-                          %{_mingw64_install_post}
+%define __find_requires %_mingw64_findrequires
+%define __find_provides %_mingw64_findprovides
+%define __os_install_post %_mingw64_debug_install_post \
+                          %_mingw64_install_post
+
 Name:           mingw64-winpthreads
 Version:        3.1.0
 Release:        0
@@ -30,7 +31,8 @@ Summary:        A pthreads implementation for Windows
 License:        MIT and BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            http://mingw-w64.sf.net/
-Source:         mingw-w64-winpthreads-%{version}.tar.xz
+
+Source:         mingw-w64-winpthreads-%version.tar.xz
 BuildRequires:  mingw64-cross-gcc-bootstrap
 BuildRequires:  mingw64-cross-pkg-config
 BuildRequires:  mingw64-filesystem
@@ -42,12 +44,20 @@ BuildArch:      noarch
 %description
 mingw-w64's implementation of POSIX threads for Windows.
 
+%package -n mingw64-libwinpthread1
+Summary:        A pthreads implementation for Windows
+Group:          System/Libraries
+Obsoletes:      mingw64-winpthreads
+
+%description -n mingw64-libwinpthread1
+mingw-w64's implementation of POSIX threads for Windows.
+
 %package devel
 Summary:        Development files for mingw64-winpthreads
 Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}
+Requires:       %name = %version
 Provides:       mingw64-unistd-pthread-devel
-Conflicts:      mingw64-headers-dummy-pthread otherproviders(mingw64-unistd-pthread-devel)
+Conflicts:      mingw64-headers-dummy-pthread, otherproviders(mingw64-unistd-pthread-devel)
 
 %description devel
 mingw-w64's implementation of POSIX threads for Windows.
@@ -63,24 +73,24 @@ mingw-w64's implementation of POSIX threads for Windows.
 mkdir fakelib
 pushd fakelib
 touch empty.c
-%{_mingw64_cc} -c empty.c
-%{_mingw64_ar} rsc libpthread.a empty.o
+%_mingw64_cc -c empty.c
+%_mingw64_ar rsc libpthread.a empty.o
 popd
-%{_mingw64_configure} \
+%_mingw64_configure \
 	--disable-static \
 	--enable-shared
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install %{?_smp_mflags}
+make DESTDIR="%buildroot" install %{?_smp_mflags}
 
-%files
+%files -n mingw64-libwinpthread1
 %defattr(-,root,root)
-%{_mingw64_bindir}/*.dll
+%_mingw64_bindir/libwinpthread-1.dll
 
 %files devel
 %defattr(-,root,root)
-%{_mingw64_includedir}/
-%{_mingw64_libdir}/
+%_mingw64_includedir/
+%_mingw64_libdir/
 
 %changelog