diff --git a/_service b/_service
index 14431cc..deb3a59 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v6.20</param>
+    <param name="revision">refs/tags/v6.21</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>
diff --git a/wine-6.20.tar.xz b/wine-6.20.tar.xz
deleted file mode 100644
index 92855cc..0000000
--- a/wine-6.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4028237e9c7bfdd56d7604af19783ff812f645f29c27de742a688e4535528471
-size 26921644
diff --git a/wine-6.20.tar.xz.sign b/wine-6.20.tar.xz.sign
deleted file mode 100644
index c2b00fa..0000000
--- a/wine-6.20.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmFzFOAACgkQzvrI6q8X
-UZ05lw/+MFt8+hnihi4UKGlGY/pgR4iDontvPbSrBXnwwOBM21qS48OF+NnPNSAF
-gzIgyH6KS0GnF47KM/ur7NbzJAB2Z4MKFKeFBqVqfKooRDu9AxoPuD8E6BiCPtKv
-fTMGSNW05md+DPwPQU/G7Yi4A8uhzeg7PaP/XmAKqGCuFLD+4w7g6E+WCJxSS0qB
-0VwifzuTY5+NQekocZS5EMeIzW9+pE+B6jYe+jQhAAgRmrT811RPZ6gIg8hjwSmg
-aSCnCYTytD5bH4dDiod/X+ioAvPcqtE1hY8bbORiD8CvxE1Ewmucd1L3wKfND7h1
-zVWmpEFa5KNNCuJdD42rrXtYA3RcPqDMVzJ6vU7nMSi2MmZBxwgoATFST9MyJPXv
-L8KJLiMsLKnQSJJe0cLvL7Gcb+XjpMwIAQbi7zfrh/jrFwhtgHL/ZyKrrWY41IVx
-RXxhW/msHr+Op5khN3dVqhyOeiR3vQLGkjrc32+or3syPLcMkZu85X2YyG/B/phj
-XX/8xB0+5YdN+PVS5KdvmgHmDMGkDRQAjFV/99uo9nbdEwkoJmr/G/Toilr3irMQ
-xzSt0jdKiQYDAOYkUQLreDlf5U8BVL3M8PXywr8KmdcRCltIM1szNax1BNKbflCV
-CgGTLPRMvSpSMC/FEzzWayVnmDed+E+gLqkYQITKn/z+0UXF04o=
-=l5p1
------END PGP SIGNATURE-----
diff --git a/wine-6.21.tar.xz b/wine-6.21.tar.xz
new file mode 100644
index 0000000..1266504
--- /dev/null
+++ b/wine-6.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f7b67572b52a7150f3dcc43318b40cf10425171319edf6368a60274642e079ce
+size 26973172
diff --git a/wine-6.21.tar.xz.sign b/wine-6.21.tar.xz.sign
new file mode 100644
index 0000000..6484dd2
--- /dev/null
+++ b/wine-6.21.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmGFrPYACgkQzvrI6q8X
+UZ3J8hAAlE7+rhNsQBcuTeXfAphUjSDVZkdnj/MF9CsyeKE9ui/sssnauwKKlS1f
+6bR5AzNW7tDdLLyEqBAZuCL+oJxsU7itfuZ7qr1Bef3Ev7inz8/oXofAB5w+Ksi0
+oSMvnthXdVJ/3QEfSpDHDV5RpwmebSVALqkkbUKel9RV+y1UGJ7Cku2aJ7cnbX3t
+ut+eSOJTvZj+Y6BXzANKmTlVzIxjTStojUdpWR0m9i9uCqv8CX7JLmHC9V9WBOwY
+S8/ngjQOUUOIcFfwogK5z5H1hFFfK4i64pu4teNPnAaGuERGizW7JHVb79QhqrBA
+sD3oYRIP8xQ/a11gPkSQOi4cWzCCa1WC2hJHCbcOKX/8vKfesgEk7qjADMIFswhi
+lHc4D9xBgWgowqH9zVk7YkUtLijObk5e5+UpZLhGrRMaa9g55iEnA02pXPOYTmzs
+aJgGYkzoRjqBkQFNKk2HVU/pxUP9uKwq57BW8AuOy0r1IpFGQ05X0TV/xUvSLYZJ
+OWtxbaAJiM0ONqbeScpTF15/ypE4Q7AXowX41onBEP1FLv6dmBuYbmfJKxTg4X7o
+WoyaYgcdJrzOqgBNfnqIqMj3RQ3j8nNxQv6NdR1EBFuB+XxnLQ9uNJE93yJ150l4
+3JikHZpolynfMhuE4gPGcAPxevXynAoLVBB6VRMWOM43HFcfwJ0=
+=nQ9Y
+-----END PGP SIGNATURE-----
diff --git a/wine-fix-faudio.patch b/wine-fix-faudio.patch
deleted file mode 100644
index e4e29da..0000000
--- a/wine-fix-faudio.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- wine-6.20/libs/faudio/src/FAudio_platform_win32.c.xx	2021-10-23 16:09:26.791259433 +0200
-+++ wine-6.20/libs/faudio/src/FAudio_platform_win32.c	2021-10-23 16:09:38.291259232 +0200
-@@ -622,6 +622,7 @@
- {
- 	if (!data) return 0;
- 	FAudio_free(data);
-+	return 0;
- }
- 
- FAudioIOStream* FAudio_memopen(void *mem, int len)
diff --git a/wine-staging-6.20.tar.xz b/wine-staging-6.20.tar.xz
deleted file mode 100644
index 29e118c..0000000
--- a/wine-staging-6.20.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2896018ee0117b2995a9813ebd5e11a0ffc52cf8c12b7f3c4540c7532cdac534
-size 7323272
diff --git a/wine-staging-6.21.tar.xz b/wine-staging-6.21.tar.xz
new file mode 100644
index 0000000..bf59630
--- /dev/null
+++ b/wine-staging-6.21.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:182b8f77063a4541f6f4f7300a69c1600870f91188c9164d51951cae81e8b7e4
+size 7318456
diff --git a/wine.changes b/wine.changes
index 860b737..ea6dc7c 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Nov  7 12:43:50 UTC 2021 - Marcus Meissner <meissner@suse.com>
+
+- updated to 6.21 development release
+  - WinSpool, GPhoto, and a few other modules converted to PE.
+  - Better support for inline functions in DbgHelp.
+  - Beginnings of a MSDASQL implementation.
+  - Various bug fixes.
+- update staging to 6.21 release
+- wine-fix-faudio.patch: removed, fixed upstream 
+
 -------------------------------------------------------------------
 Sat Oct 23 08:22:24 UTC 2021 - Marcus Meissner <meissner@suse.com>
 
diff --git a/wine.spec b/wine.spec
index f626a6d..f292cc4 100644
--- a/wine.spec
+++ b/wine.spec
@@ -29,8 +29,8 @@
 %endif
 
 # needs to be on top due to usage of %version macro below
-%define realver 6.20
-Version:        6.20
+%define realver 6.21
+Version:        6.21
 Release:        0
 
 %if "%{flavor}" != ""
@@ -143,7 +143,6 @@ Source7:        baselibs.conf
 Source8:        wine-rpmlintrc
 # SUSE specific patches
 # - currently none, but add them here
-Patch0:         wine-fix-faudio.patch
 Recommends:     wine-gecko >= 2.47.2
 Conflicts:      wine-gecko < 2.47.2
 Recommends:     wine-mono >= 6.1.1
@@ -162,7 +161,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc armv7l armv7hl aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 6.20
+%define staging_version 6.21
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel