diff --git a/mingw32-winpthreads.spec b/mingw32-winpthreads.spec
index 3b4b1a6..dbdd443 100644
--- a/mingw32-winpthreads.spec
+++ b/mingw32-winpthreads.spec
@@ -16,23 +16,22 @@
 #
 
 
-%_mingw32_package_header_debug
 Name:           mingw32-winpthreads
 Version:        3.1.0
 Release:        0
 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
+Url:            http://mingw-w64.sf.net/
+Source:         mingw-w64-winpthreads-%{version}.tar.xz
 BuildRequires:  mingw32-cross-gcc-bootstrap
 BuildRequires:  mingw32-cross-pkg-config
 BuildRequires:  mingw32-filesystem
 BuildRequires:  mingw32-runtime
 BuildRequires:  xz
-BuildRoot:      %_tmppath/%name-%version-build
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
+%{_mingw32_package_header_debug}
 #!BuildIgnore:  post-build-checks
 
 %description
@@ -49,10 +48,10 @@ mingw-w64's implementation of POSIX threads for Windows.
 %package devel
 Summary:        Development files for mingw32-winpthreads
 Group:          Development/Libraries/C and C++
-Requires:       mingw32-libwinpthread1 = %version
+Requires:       mingw32-libwinpthread1 = %{version}
 Provides:       mingw32-unistd-pthread-devel
-Conflicts:      mingw32-headers-dummy-pthread, otherproviders(mingw32-unistd-pthread-devel)
 Obsoletes:      mingw32-headers-dummy-pthread
+Conflicts:      mingw32-headers-dummy-pthread, otherproviders(mingw32-unistd-pthread-devel)
 
 %description devel
 mingw-w64's implementation of POSIX threads for Windows.
@@ -68,27 +67,24 @@ mingw-w64's implementation of POSIX threads for Windows.
 mkdir fakelib
 pushd fakelib
 touch empty.c
-%_mingw32_cc -c empty.c
-%_mingw32_ar rsc libpthread.a empty.o
+%{_mingw32_cc} -c empty.c
+%{_mingw32_ar} rsc libpthread.a empty.o
 popd
-%_mingw32_configure \
+%{_mingw32_configure} \
 	--disable-static \
 	--enable-shared
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%buildroot install %{?_smp_mflags}
-
-%clean
-:
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 %files -n mingw32-libwinpthread1
 %defattr(-,root,root)
-%_mingw32_bindir/libwinpthread-1.dll
+%{_mingw32_bindir}/libwinpthread-1.dll
 
 %files devel
 %defattr(-,root,root)
-%_mingw32_includedir/
-%_mingw32_libdir/
+%{_mingw32_includedir}/
+%{_mingw32_libdir}/
 
 %changelog