diff --git a/mingw64-winpthreads.changes b/mingw64-winpthreads.changes
index 6a23927..d3f33a3 100644
--- a/mingw64-winpthreads.changes
+++ b/mingw64-winpthreads.changes
@@ -2,14 +2,14 @@
 Wed Mar 17 15:52:33 UTC 2021 - Jeff Kowalczyk <jkowalczyk@suse.com>
 
 - Update to new upstream release 8.0.0
-  * winpthreads: Always define `__USE_MINGW_ANSI_STDIO` to zero
-  * winpthreads: remove unused dwFlags variable in sched.c
-  * winpthreads: don't call SetThreadContext in winstore builds
-  * winpthreads: do not call GetHandleInformation in winstore build
-  * winpthreads: simplify the handle validity in pthread_check()
-  * winpthreads: always return 0 in pthread_check() if the thread ended is 0
-  * winpthreads: do not use the XXXExceptionHandler API in winstore builds
-  * winpthreads: simplify the USE_VEH_FOR_MSC_SETTHREADNAME check
+  * Always define `__USE_MINGW_ANSI_STDIO` to zero
+  * Remove unused dwFlags variable in sched.c
+  * Don't call SetThreadContext in winstore builds
+  * Do not call GetHandleInformation in winstore build
+  * Simplify the handle validity in pthread_check()
+  * Always return 0 in pthread_check() if the thread ended is 0
+  * Do not use the XXXExceptionHandler API in winstore builds
+  * Simplify the USE_VEH_FOR_MSC_SETTHREADNAME check
 
 -------------------------------------------------------------------
 Mon Nov 25 17:31:02 UTC 2019 - Ralf Habacker <ralf.habacker@freenet.de>
diff --git a/mingw64-winpthreads.spec b/mingw64-winpthreads.spec
index 6ab675a..585b4f0 100644
--- a/mingw64-winpthreads.spec
+++ b/mingw64-winpthreads.spec
@@ -30,7 +30,6 @@ BuildRequires:  mingw64-cross-pkg-config
 BuildRequires:  mingw64-filesystem
 BuildRequires:  mingw64-runtime
 BuildRequires:  xz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %_mingw64_package_header_debug
 BuildArch:      noarch
 #!BuildIgnore:  post-build-checks
@@ -61,7 +60,7 @@ mingw-w64's implementation of POSIX threads for Windows.
 %_mingw64_debug_package
 
 %prep
-%setup -q -n mingw-w64-v%{version}/mingw-w64-libraries/winpthreads
+%autosetup -p1 -n mingw-w64-v%version/mingw-w64-libraries/winpthreads
 
 %build
 # The build is trying to link with libpthread.a but it has no need
@@ -79,17 +78,15 @@ popd
 	--enable-static \
 	--enable-shared \
     LDFLAGS="%{_mingw64_ldflags_bootstrap}"
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 
 %files -n mingw64-libwinpthread1
-%defattr(-,root,root)
 %_mingw64_bindir/libwinpthread-1.dll
 
 %files devel
-%defattr(-,root,root)
 %_mingw64_includedir/
 %_mingw64_libdir/