diff --git a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch
index 330037d8..d969b8c3 100644
--- a/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch
+++ b/patches/ntdll-ApiSetMap/0001-ntdll-Add-dummy-apiset-to-PEB.patch
@@ -1,4 +1,4 @@
-From 768f70f18be51fe0a1d92c04fbf3795fd619e127 Mon Sep 17 00:00:00 2001
+From ce7b43fafe87ec364bb98415dac1283fe611ead0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Mon, 3 Apr 2017 01:06:26 +0200
 Subject: [PATCH] ntdll: Add dummy apiset to PEB.
@@ -12,27 +12,27 @@ Subject: [PATCH] ntdll: Add dummy apiset to PEB.
  create mode 100644 include/apiset.h
 
 diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
-index c2187a19397..2fb24737495 100644
+index a6cfbb675eb..1354997f2e3 100644
 --- a/dlls/ntdll/loader.c
 +++ b/dlls/ntdll/loader.c
-@@ -170,6 +170,7 @@ static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
+@@ -169,6 +169,7 @@ static RTL_CRITICAL_SECTION peb_lock = { &peb_critsect_debug, -1, 0, 0, 0, 0 };
+ static PEB_LDR_DATA ldr = { sizeof(ldr), TRUE };
  static RTL_BITMAP tls_bitmap;
  static RTL_BITMAP tls_expansion_bitmap;
- static RTL_BITMAP fls_bitmap;
 +static API_SET_NAMESPACE_ARRAY apiset_map;
  
  static WINE_MODREF *cached_modref;
  static WINE_MODREF *current_modref;
-@@ -4017,6 +4018,7 @@ static NTSTATUS process_init(void)
+@@ -4019,6 +4020,7 @@ static NTSTATUS process_init(void)
  
      peb->LdrData            = &ldr;
      peb->FastPebLock        = &peb_lock;
 +    peb->ApiSetMap          = &apiset_map;
      peb->TlsBitmap          = &tls_bitmap;
      peb->TlsExpansionBitmap = &tls_expansion_bitmap;
-     peb->FlsBitmap          = &fls_bitmap;
+     peb->LoaderLock         = &loader_section;
 diff --git a/include/Makefile.in b/include/Makefile.in
-index 34daad90e78..ad4a131c245 100644
+index 9ea8416211d..d52c0adf309 100644
 --- a/include/Makefile.in
 +++ b/include/Makefile.in
 @@ -15,6 +15,7 @@ SOURCES = \
@@ -87,7 +87,7 @@ index 00000000000..6801cd5f509
 +
 +#endif
 diff --git a/include/winternl.h b/include/winternl.h
-index 82328167c9e..6c720f7eff6 100644
+index 89ea58c2d93..5723e0b3b7a 100644
 --- a/include/winternl.h
 +++ b/include/winternl.h
 @@ -23,6 +23,7 @@
@@ -98,7 +98,7 @@ index 82328167c9e..6c720f7eff6 100644
  
  #ifdef __cplusplus
  extern "C" {
-@@ -289,7 +290,7 @@ typedef struct _PEB
+@@ -315,7 +316,7 @@ typedef struct _PEB
      ULONG                        EnvironmentUpdateCount;            /* 028/050 */
      PVOID                        KernelCallbackTable;               /* 02c/058 */
      ULONG                        Reserved[2];                       /* 030/060 */
diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index 52efddcb..db3860ea 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "c29f9e6ee7656aa028bb1630284e7d4873bd5b0f"
+	echo "412db7789379549c4f821acb11c92f7aabab71c9"
 }
 
 # Show version information
@@ -5065,7 +5065,7 @@ fi
 # |   *	[#48684] BlazBlue: Calamity Trigger requires for xactengine 3.3 interface.
 # |
 # | Modified files:
-# |   *	dlls/x3daudio1_7/Makefile.in, dlls/xactengine3_7/tests/Makefile.in, dlls/xactengine3_7/tests/globals.xgs,
+# |   *	configure.ac, dlls/x3daudio1_7/Makefile.in, dlls/xactengine3_7/tests/Makefile.in, dlls/xactengine3_7/tests/globals.xgs,
 # | 	dlls/xactengine3_7/tests/rsrc.rc, dlls/xactengine3_7/tests/xact3.c
 # |
 if test "$enable_xactengine_initial" -eq 1; then
diff --git a/staging/upstream-commit b/staging/upstream-commit
index b2a8bacc..300da0ad 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-c29f9e6ee7656aa028bb1630284e7d4873bd5b0f
+412db7789379549c4f821acb11c92f7aabab71c9