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 15d3e93a..e1e5f855 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,25 +1,25 @@
-From d2ff621f7a3de93cf436239f666fd80ee9052e2e Mon Sep 17 00:00:00 2001
+From fe192f23156700c32c57b2059930a9c9bb6592b4 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.
 
 ---
  configure.ac                    |   1 +
- dlls/win32k.sys/Makefile.in     |   6 +
+ dlls/win32k.sys/Makefile.in     |   7 +
  dlls/win32k.sys/main.c          |  39 +++++
  dlls/win32k.sys/win32k.sys.spec | 246 ++++++++++++++++++++++++++++++++
  loader/wine.inf.in              |   1 +
  tools/make_specfiles            |   1 +
- 6 files changed, 294 insertions(+)
+ 6 files changed, 295 insertions(+)
  create mode 100644 dlls/win32k.sys/Makefile.in
  create mode 100644 dlls/win32k.sys/main.c
  create mode 100644 dlls/win32k.sys/win32k.sys.spec
 
 diff --git a/configure.ac b/configure.ac
-index 5886422439e..e96951c8839 100644
+index 79a31396866..180977fa40c 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3250,6 +3250,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
+@@ -3268,6 +3268,7 @@ WINE_CONFIG_MAKEFILE(dlls/wevtsvc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc)
  WINE_CONFIG_MAKEFILE(dlls/wiaservc/tests)
  WINE_CONFIG_MAKEFILE(dlls/wimgapi)
@@ -29,16 +29,17 @@ index 5886422439e..e96951c8839 100644
  WINE_CONFIG_MAKEFILE(dlls/win32u/tests)
 diff --git a/dlls/win32k.sys/Makefile.in b/dlls/win32k.sys/Makefile.in
 new file mode 100644
-index 00000000000..f88b6a9a2a2
+index 00000000000..7bde0f9b058
 --- /dev/null
 +++ b/dlls/win32k.sys/Makefile.in
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +MODULE    = win32k.sys
 +IMPORTS   = ntoskrnl
-+EXTRADLLFLAGS = -mno-cygwin -Wb,--subsystem,native
++EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
 +
 +SOURCES = \
-+	main.c
++	main.c \
++	win32k.sys.spec
 diff --git a/dlls/win32k.sys/main.c b/dlls/win32k.sys/main.c
 new file mode 100644
 index 00000000000..a1ec2d4fa3f
@@ -337,10 +338,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 8b3cc9b16d4..7483eb9e48d 100644
+index 892078a4a96..0b54a829803 100644
 --- a/loader/wine.inf.in
 +++ b/loader/wine.inf.in
-@@ -2555,6 +2555,7 @@ HKLM,SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86,"Version",2,"14.42.344
+@@ -806,6 +806,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,7 +350,7 @@ index 8b3cc9b16d4..7483eb9e48d 100644
  ; themes
  10,resources\themes\light,light.msstyles
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 48518213201..cd10c152bbe 100755
+index 11677fa34af..e1384125e29 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
 @@ -134,6 +134,7 @@ my @dll_groups =
@@ -361,5 +362,5 @@ index 48518213201..cd10c152bbe 100755
   [
    "mscoree",
 -- 
-2.47.2
+2.51.0
 
diff --git a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
index 68d96c5c..01dc0335 100644
--- a/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0002-dxgkrnl.sys-Add-stub-driver.patch
@@ -1,23 +1,23 @@
-From 878f3021fc53827d6ea9ade138b3bd49493c156d Mon Sep 17 00:00:00 2001
+From 06db7519b29323796388584033012c380364f287 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:41:02 +0200
 Subject: [PATCH] dxgkrnl.sys: Add stub driver.
 
 ---
  configure.ac                      |  1 +
- dlls/dxgkrnl.sys/Makefile.in      |  6 +++++
+ dlls/dxgkrnl.sys/Makefile.in      |  7 ++++++
  dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 +++++++++++++++++++++
  dlls/dxgkrnl.sys/main.c           | 39 +++++++++++++++++++++++++++++++
- 4 files changed, 72 insertions(+)
+ 4 files changed, 73 insertions(+)
  create mode 100644 dlls/dxgkrnl.sys/Makefile.in
  create mode 100644 dlls/dxgkrnl.sys/dxgkrnl.sys.spec
  create mode 100644 dlls/dxgkrnl.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index db3685312cb..52c9a69eb59 100644
+index 180977fa40c..bf7ee8a7af5 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2656,6 +2656,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn)
+@@ -2711,6 +2711,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn)
  WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
  WINE_CONFIG_MAKEFILE(dlls/dxgi)
  WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
@@ -27,15 +27,16 @@ index db3685312cb..52c9a69eb59 100644
  WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
 diff --git a/dlls/dxgkrnl.sys/Makefile.in b/dlls/dxgkrnl.sys/Makefile.in
 new file mode 100644
-index 00000000000..564094de878
+index 00000000000..960afa4bffd
 --- /dev/null
 +++ b/dlls/dxgkrnl.sys/Makefile.in
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +MODULE    = dxgkrnl.sys
 +IMPORTS   = ntoskrnl
-+EXTRADLLFLAGS = -mno-cygwin -Wb,--subsystem,native
++EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
 +
 +SOURCES = \
++	dxgkrnl.sys.spec \
 +	main.c
 diff --git a/dlls/dxgkrnl.sys/dxgkrnl.sys.spec b/dlls/dxgkrnl.sys/dxgkrnl.sys.spec
 new file mode 100644
@@ -115,5 +116,5 @@ index 00000000000..c5639c237c8
 +    return STATUS_SUCCESS;
 +}
 -- 
-2.43.0
+2.51.0
 
diff --git a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
index b79b6de7..976eaa6c 100644
--- a/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
+++ b/patches/winedevice-Default_Drivers/0003-dxgmms1.sys-Add-stub-driver.patch
@@ -1,23 +1,23 @@
-From c1cdbc7937f2f09fd7356500e519cd7b8259ec12 Mon Sep 17 00:00:00 2001
+From b85ce5729ea8e3cbaeeb78553d9b6297d522667b 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:42:32 +0200
 Subject: [PATCH] dxgmms1.sys: Add stub driver.
 
 ---
  configure.ac                      |  1 +
- dlls/dxgmms1.sys/Makefile.in      |  6 +++++
+ dlls/dxgmms1.sys/Makefile.in      |  7 ++++++
  dlls/dxgmms1.sys/dxgmms1.sys.spec |  2 ++
  dlls/dxgmms1.sys/main.c           | 39 +++++++++++++++++++++++++++++++
- 4 files changed, 48 insertions(+)
+ 4 files changed, 49 insertions(+)
  create mode 100644 dlls/dxgmms1.sys/Makefile.in
  create mode 100644 dlls/dxgmms1.sys/dxgmms1.sys.spec
  create mode 100644 dlls/dxgmms1.sys/main.c
 
 diff --git a/configure.ac b/configure.ac
-index 52c9a69eb59..2971e3e02e9 100644
+index bf7ee8a7af5..1223ddf65de 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -2657,6 +2657,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
+@@ -2712,6 +2712,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxdiagn/tests)
  WINE_CONFIG_MAKEFILE(dlls/dxgi)
  WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
  WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
@@ -27,15 +27,16 @@ index 52c9a69eb59..2971e3e02e9 100644
  WINE_CONFIG_MAKEFILE(dlls/dxva2/tests)
 diff --git a/dlls/dxgmms1.sys/Makefile.in b/dlls/dxgmms1.sys/Makefile.in
 new file mode 100644
-index 00000000000..a548331e0ea
+index 00000000000..9856730daee
 --- /dev/null
 +++ b/dlls/dxgmms1.sys/Makefile.in
-@@ -0,0 +1,6 @@
+@@ -0,0 +1,7 @@
 +MODULE    = dxgmms1.sys
 +IMPORTS   = ntoskrnl
-+EXTRADLLFLAGS = -mno-cygwin -Wb,--subsystem,native
++EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native
 +
 +SOURCES = \
++	dxgmms1.sys.spec \
 +	main.c
 diff --git a/dlls/dxgmms1.sys/dxgmms1.sys.spec b/dlls/dxgmms1.sys/dxgmms1.sys.spec
 new file mode 100644
@@ -91,5 +92,5 @@ index 00000000000..686493d3296
 +    return STATUS_SUCCESS;
 +}
 -- 
-2.43.0
+2.51.0