diff --git a/mingw64-headers.spec b/mingw64-headers.spec
index b2bd3df..35c9038 100644
--- a/mingw64-headers.spec
+++ b/mingw64-headers.spec
@@ -17,7 +17,6 @@
 
 
 %define snapshot -r6638
-
 Name:           mingw64-headers
 Version:        3.1.99
 Release:        0
@@ -25,15 +24,14 @@ Summary:        MinGW-w64 headers for Win32 and Win64
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/C and C++
 Url:            http://mingw-w64.sf.net/
-
 # Generated from downloadable mingw-w64-%version.tar.bz2
-Source:         mingw-w64-headers-%version%snapshot.tar.xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
+Source:         mingw-w64-headers-%{version}%{snapshot}.tar.xz
 BuildRequires:  mingw64-filesystem
 BuildRequires:  xz
 #!BuildIgnore:	post-build-checks
 Requires:       mingw64-unistd-pthread-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 MinGW-w64 delivers runtime, headers and libs for developing both 64
@@ -53,25 +51,25 @@ and only exist to satisfy dependencies in MinGW's unistd.h until
 an actual pthread implementation (like winpthreads) is installed.
 
 %prep
-%setup -qn mingw-w64-headers
+%setup -q -n mingw-w64-headers
 
 %build
-%_mingw64_configure \
+%{_mingw64_configure} \
 	--with-sdk=all \
 	--enable-secure-api
 make %{?_smp_mflags}
 
 %install
-make DESTDIR="%buildroot" install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 
 %files
 %defattr(-,root,root)
-%_mingw64_includedir/
-%exclude %_mingw64_includedir/pthread_*.h
+%{_mingw64_includedir}/
+%exclude %{_mingw64_includedir}/pthread_*.h
 
 %files dummy-pthread
 %defattr(-,root,root)
-%dir %_mingw64_includedir
-%_mingw64_includedir/pthread_*.h
+%dir %{_mingw64_includedir}
+%{_mingw64_includedir}/pthread_*.h
 
 %changelog