diff --git a/mingw-w64-v8.0.0.tar.bz2 b/mingw-w64-v8.0.0.tar.bz2
deleted file mode 100644
index 267233f..0000000
--- a/mingw-w64-v8.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762
-size 9370799
diff --git a/mingw-w64-v9.0.0-strnlen_s.patch b/mingw-w64-v9.0.0-strnlen_s.patch
new file mode 100644
index 0000000..01cdfca
--- /dev/null
+++ b/mingw-w64-v9.0.0-strnlen_s.patch
@@ -0,0 +1,14 @@
+--- mingw-w64-v9.0.0/mingw-w64-headers/crt/sec_api/string_s.h	2021-05-22 14:34:25.000000000 +0200
++++ mingw-w64-v9.0.0/mingw-w64-headers/crt/sec_api/string_s.h	2021-07-08 09:10:48.082143084 +0200
+@@ -43,9 +43,11 @@
+   _CRTIMP errno_t __cdecl strcat_s(char *_Dst, rsize_t _SizeInBytes, const char * _Src);
+   __DEFINE_CPP_OVERLOAD_SECURE_FUNC_0_1(errno_t, strcat_s, char, _Dest, const char *, _Source)
+ 
++#ifdef _NEEDS_STRNLEN_S
+   __forceinline size_t __cdecl strnlen_s(const char * _src, size_t _count) {
+     return _src ? strnlen(_src, _count) : 0;
+   }
++#endif
+ 
+   _SECIMP errno_t __cdecl memmove_s(void *_dest,size_t _numberOfElements,const void *_src,size_t _count);
+ #ifndef _WSTRING_S_DEFINED
diff --git a/mingw-w64-v9.0.0.tar.bz2 b/mingw-w64-v9.0.0.tar.bz2
new file mode 100644
index 0000000..f14476b
--- /dev/null
+++ b/mingw-w64-v9.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1929b94b402f5ff4d7d37a9fe88daa9cc55515a6134805c104d1794ae22a4181
+size 9537758
diff --git a/mingw32-headers.changes b/mingw32-headers.changes
index 6783092..136e17e 100644
--- a/mingw32-headers.changes
+++ b/mingw32-headers.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Jul  8 07:13:22 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Added patch:
+  * mingw-w64-v9.0.0-strnlen_s.patch
+    + work around the "multiple definition of `strnlen_s'" error
+    + the function still accessible by defining _NEEDS_STRNLEN_S
+      before inclusion of the header
+
+-------------------------------------------------------------------
+Fri Jul  2 12:34:00 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 9.0.0
+  * Various new and updated API headers
+  * at_quick_exit implementation
+  * dism API
+
 -------------------------------------------------------------------
 Thu Dec  3 12:18:00 UTC 2020 - Tobias Klausmann <tobias.klausmann@freenet.de>
 
diff --git a/mingw32-headers.spec b/mingw32-headers.spec
index 4c0b494..7abc7aa 100644
--- a/mingw32-headers.spec
+++ b/mingw32-headers.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mingw32-headers
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           mingw32-headers
-Version:        8.0.0
+Version:        9.0.0
 Release:        0
 Summary:        MinGW-w64 headers for Win32 and Win64
 License:        SUSE-Public-Domain
@@ -25,11 +25,11 @@ Group:          Development/Libraries/C and C++
 URL:            http://mingw-w64.sf.net/
 Source:         http://downloads.sf.net/mingw-w64/mingw-w64-v%{version}.tar.bz2
 Source1000:     %name-rpmlintrc
+Patch0:         mingw-w64-v9.0.0-strnlen_s.patch
 BuildRequires:  mingw32-filesystem
 BuildRequires:  xz
 #!BuildIgnore:	post-build-checks
 Requires:       mingw32-unistd-pthread-devel
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
@@ -50,24 +50,22 @@ and only exist to satisfy dependencies in MinGW's unistd.h until
 an actual pthread implementation (like winpthreads) is installed.
 
 %prep
-%setup -q -n mingw-w64-v%{version}/mingw-w64-headers
+%autosetup -n mingw-w64-v%version/mingw-w64-headers -p2
 
 %build
 %_mingw32_configure \
 	--enable-sdk=all \
 	--enable-secure-api
-make %{?_smp_mflags}
+%make_build
 
 %install
 %make_install
 
 %files
-%defattr(-,root,root)
 %_mingw32_includedir/
 %exclude %_mingw32_includedir/pthread_*.h
 
 %files dummy-pthread
-%defattr(-,root,root)
 %dir %_mingw32_includedir
 %_mingw32_includedir/pthread_*.h