diff --git a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
index d2720d8b..15d3e93a 100644
--- a/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0001-win32k.sys-Add-stub-driver.patch
@@ -1,4 +1,4 @@
-From 3473fecb92adeabc91f4ec5a35223a8886bf854c Mon Sep 17 00:00:00 2001
+From d2ff621f7a3de93cf436239f666fd80ee9052e2e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Thu, 8 Jun 2017 23:38:38 +0200
 Subject: [PATCH] win32k.sys: Add stub driver.
@@ -16,15 +16,15 @@ Subject: [PATCH] win32k.sys: Add stub driver.
  create mode 100644 dlls/win32k.sys/win32k.sys.spec
 
 diff --git a/configure.ac b/configure.ac
-index 57064a05fe5..db3685312cb 100644
+index 5886422439e..e96951c8839 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3192,6 +3192,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
+@@ -3250,6 +3250,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
  WINE_CONFIG_MAKEFILE(dlls/wimgapi)
 +WINE_CONFIG_MAKEFILE(dlls/win32k.sys)
- WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
+ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16)
  WINE_CONFIG_MAKEFILE(dlls/win32u)
  WINE_CONFIG_MAKEFILE(dlls/win32u/tests)
 diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
@@ -337,10 +337,10 @@ index 00000000000..c79439151e4
 +@ cdecl -private memmove(ptr ptr long) ntoskrnl.exe.memmove
 +@ cdecl -private memset(ptr long long) ntoskrnl.exe.memset
 diff --git a/loader/wine.inf.in b/loader/wine.inf.in
-index 40549bb34aa..015b18d00c6 100644
+index 8b3cc9b16d4..7483eb9e48d 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2209,6 +2209,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
+@@ -2555,6 +2555,7 @@ HKLM,SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86,"Version",2,"14.42.344
  11,,explorer.exe
  11,,iexplore.exe
  11,,notepad.exe
@@ -349,10 +349,10 @@ index 40549bb34aa..015b18d00c6 100644
  ; themes
  10,resources\themes\light,light.msstyles
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 0509d41d5c1..24fc63fec00 100755
+index 48518213201..cd10c152bbe 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -130,6 +130,7 @@ my @dll_groups =
+@@ -134,6 +134,7 @@ my @dll_groups =
   [
    "ntoskrnl.exe",
    "hal",
@@ -361,5 +361,5 @@ index 0509d41d5c1..24fc63fec00 100755
   [
    "mscoree",
 -- 
-2.43.0
+2.47.2
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 8faee973..d67b1077 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-e956c4ec71dd0f41090df3863e6f937963b2b7d9
+f3843ea16b85012d0d0ca0f4f95a4c87c97d03f9