diff --git a/mingw64-runtime.spec b/mingw64-runtime.spec
index 3445010..ee805c8 100644
--- a/mingw64-runtime.spec
+++ b/mingw64-runtime.spec
@@ -22,9 +22,7 @@
 %define __find_requires %{_mingw64_findrequires}
 %define __find_provides %{_mingw64_findprovides}
 %define __os_install_post %{_mingw64_install_post}
-
 %define snapshot -r6638
-
 Name:           mingw64-runtime
 Version:        3.1.99
 Release:        0
@@ -32,38 +30,36 @@ Summary:        MinGW-w64 runtime for Win64
 License:        SUSE-Public-Domain
 Group:          Development/Libraries/C and C++
 Url:            http://mingw-w64.sf.net/
-
-Source:         mingw-w64-crt-%version%snapshot.tar.xz
-Source100:      %name-rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
+Source:         mingw-w64-crt-%{version}%{snapshot}.tar.xz
+Source100:      %{name}-rpmlintrc
 #!BuildIgnore: post-build-checks
 BuildRequires:  mingw64-cross-binutils
 BuildRequires:  mingw64-cross-gcc-bootstrap >= 4.4.0
 BuildRequires:  mingw64-filesystem
-BuildRequires:  mingw64-headers >= %version
+BuildRequires:  mingw64-headers >= %{version}
 BuildRequires:  xz
-
 # Once this is installed, mingw64-bootstrap (binary bootstrapper) is no
 # longer needed.
 Obsoletes:      mingw64-runtime-bootstrap
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 MinGW Win64 cross-compiler runtime, base libraries.
 
 %prep
-%setup -qn mingw-w64-crt
+%setup -q -n mingw-w64-crt
 
 %build
-%_mingw64_configure --disable-lib32 --enable-lib64
+%{_mingw64_configure} --disable-lib32 --enable-lib64
 make %{?_smp_mflags}
 
 %install
-make DESTDIR="%buildroot" install
-rm -Rfv "%buildroot/%_mingw64_includedir"/*.c
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+rm -Rfv "%{buildroot}/%{_mingw64_includedir}"/*.c
 
 %files
 %defattr(-,root,root)
-%_mingw64_libdir/
+%{_mingw64_libdir}/
 
 %changelog