diff --git a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
index bd3cefce..92284c98 100644
--- a/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
+++ b/patches/api-ms-win-Stub_DLLs/0001-kernelbase-Add-dll-and-add-stub-for-QuirkIsEnabled.patch
@@ -1,4 +1,4 @@
-From d15b2a48d5caa7e642e66d3fb1e4bdbe56b8b8f7 Mon Sep 17 00:00:00 2001
+From 8527284d33c97a71e472215edfc66a766a199096 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Fri, 15 Jan 2016 13:01:15 +0100
 Subject: kernelbase: Add dll and add stub for QuirkIsEnabled.
@@ -39,7 +39,7 @@ index 0000000..2beb34b
 +	misc.c
 diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec
 new file mode 100644
-index 0000000..392637b
+index 0000000..d85e5b1
 --- /dev/null
 +++ b/dlls/kernelbase/kernelbase.spec
 @@ -0,0 +1,1726 @@
@@ -49,7 +49,7 @@ index 0000000..392637b
 +@ stub PackageSidFromProductId
 +@ stub GetCPHashNode
 +@ stub GetNamedLocaleHashNode
-+@ stdcall InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList
++@ stdcall -norelay InterlockedPushListSList(ptr ptr ptr long) kernel32.InterlockedPushListSList
 +@ stub InternalLcidToName
 +@ stdcall AccessCheck(ptr long long ptr ptr ptr ptr ptr) advapi32.AccessCheck
 +@ stdcall AccessCheckAndAuditAlarmW(wstr ptr wstr wstr ptr long ptr long ptr ptr ptr) advapi32.AccessCheckAndAuditAlarmW
@@ -840,7 +840,7 @@ index 0000000..392637b
 +@ stdcall -arch=i386 InterlockedIncrement(ptr) kernel32.InterlockedIncrement
 +@ stdcall InterlockedPopEntrySList(ptr) kernel32.InterlockedPopEntrySList
 +@ stdcall InterlockedPushEntrySList(ptr ptr) kernel32.InterlockedPushEntrySList
-+@ stub InterlockedPushListSListEx
++@ stdcall InterlockedPushListSListEx(ptr ptr ptr long) kernel32.InterlockedPushListSListEx
 +@ stub Internal_EnumCalendarInfo
 +@ stub Internal_EnumDateFormats
 +@ stub Internal_EnumLanguageGroupLocales
@@ -1265,7 +1265,7 @@ index 0000000..392637b
 +@ stub RefreshPolicyExInternal
 +@ stub RefreshPolicyInternal
 +@ stdcall -private RegCloseKey(long) kernel32.RegCloseKey
-+@ stub RegCopyTreeW
++@ stdcall RegCopyTreeW(long wstr long) advapi32.RegCopyTreeW
 +@ stdcall -private RegCreateKeyExA(long str long ptr long long ptr ptr ptr) kernel32.RegCreateKeyExA
 +@ stub RegCreateKeyExInternalA
 +@ stub RegCreateKeyExInternalW
@@ -1826,10 +1826,10 @@ index 6b6ead2..7c2a9d1 100644
  422 stdcall -noname SHGlobalCounterCreateNamedA(str long)
  423 stdcall -noname SHGlobalCounterCreateNamedW(wstr long)
 diff --git a/tools/make_specfiles b/tools/make_specfiles
-index 808d159..ae316a0 100755
+index 97780a1..617d1a9 100755
 --- a/tools/make_specfiles
 +++ b/tools/make_specfiles
-@@ -221,6 +221,13 @@ my @dll_groups =
+@@ -226,6 +226,13 @@ my @dll_groups =
    "api-ms-win-core-processthreads-l1-1-1",
   ],
   [
@@ -1844,5 +1844,5 @@ index 808d159..ae316a0 100755
    "api-ms-win-downlevel-ole32-l1-1-0",
    "api-ms-win-core-com-l1-1-0",
 -- 
-2.7.0
+2.7.1
 
diff --git a/patches/api-ms-win-Stub_DLLs/definition b/patches/api-ms-win-Stub_DLLs/definition
index 6e4f7a5d..40dd4561 100644
--- a/patches/api-ms-win-Stub_DLLs/definition
+++ b/patches/api-ms-win-Stub_DLLs/definition
@@ -32,3 +32,4 @@ Depends: kernel32-GetFinalPathNameByHandle
 Depends: kernel32-FreeUserPhysicalPages
 Depends: kernel32-GetCurrentPackageFamilyName
 Depends: combase-RoApi
+Depends: advapi32-RegCopyTree
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 47768dbb..d5a83c32 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -2208,6 +2208,9 @@ if test "$enable_d3dx9_24_ID3DXEffect" -eq 1; then
 fi
 
 if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
+	if test "$enable_advapi32_RegCopyTree" -gt 1; then
+		abort "Patchset advapi32-RegCopyTree disabled, but api-ms-win-Stub_DLLs depends on that."
+	fi
 	if test "$enable_combase_RoApi" -gt 1; then
 		abort "Patchset combase-RoApi disabled, but api-ms-win-Stub_DLLs depends on that."
 	fi
@@ -2223,6 +2226,7 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
 	if test "$enable_ole32_CoGetApartmentType" -gt 1; then
 		abort "Patchset ole32-CoGetApartmentType disabled, but api-ms-win-Stub_DLLs depends on that."
 	fi
+	enable_advapi32_RegCopyTree=1
 	enable_combase_RoApi=1
 	enable_kernel32_FreeUserPhysicalPages=1
 	enable_kernel32_GetCurrentPackageFamilyName=1
@@ -2610,8 +2614,8 @@ fi
 # Patchset api-ms-win-Stub_DLLs
 # |
 # | This patchset has the following (direct or indirect) dependencies:
-# |   *	combase-RoApi, kernel32-FreeUserPhysicalPages, kernel32-GetCurrentPackageFamilyName, kernel32-GetFinalPathNameByHandle,
-# | 	ole32-CoGetApartmentType
+# |   *	advapi32-RegCopyTree, combase-RoApi, kernel32-FreeUserPhysicalPages, kernel32-GetCurrentPackageFamilyName,
+# | 	kernel32-GetFinalPathNameByHandle, ole32-CoGetApartmentType
 # |
 # | Modified files:
 # |   *	configure.ac, dlls/api-ms-win-appmodel-runtime-l1-1-1/Makefile.in, dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-