diff --git a/debian/changelog b/debian/changelog
index 47d42cc6..b79793d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+wine-compholio (1.7.21) UNRELEASED; urgency=low
+  * Added NT4 support to the process ACL tests.
+ -- Erich E. Hoover <erich.e.hoover@gmail.com>  Tue, 01 Jul 2014 18:30:47 -0600
+
 wine-compholio (1.7.21) unstable; urgency=low
   * Remove several patches (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Fri, 27 Jun 2014 23:08:48 -0600
diff --git a/patches/13-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch b/patches/13-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
index 7de1b67e..416705bd 100644
--- a/patches/13-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
+++ b/patches/13-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch
@@ -1,17 +1,17 @@
-From ccfec2389d48a56f0bfdf54b5f1fde6ead00e345 Mon Sep 17 00:00:00 2001
+From 977d05dff239899b548e170055e2a38ee16d5fd6 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Tue, 13 May 2014 16:49:31 -0600
+Date: Wed, 25 Jun 2014 11:49:12 -0600
 Subject: server: Add default security descriptor ownership for processes.
 
 ---
- dlls/advapi32/tests/security.c |   34 ++++++++++++++++++++++++++++++++++
+ dlls/advapi32/tests/security.c |   35 +++++++++++++++++++++++++++++++++++
  server/process.c               |   26 +++++++++++++++++++++++++-
  server/security.h              |    1 +
  server/token.c                 |    8 ++++++++
- 4 files changed, 68 insertions(+), 1 deletion(-)
+ 4 files changed, 69 insertions(+), 1 deletion(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 05da0ae..2cf18e0 100644
+index 05da0ae..2fb57c4 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3853,11 +3853,15 @@ static void test_acls(void)
@@ -30,10 +30,12 @@ index 05da0ae..2cf18e0 100644
      ACL_SIZE_INFORMATION acl_size;
      PSECURITY_DESCRIPTOR pSD;
      ACCESS_ALLOWED_ACE *ace;
-@@ -3887,6 +3891,18 @@ static void test_GetSecurityInfo(void)
-     CloseHandle( token );
-     user_sid = ((TOKEN_USER *)b)->User.Sid;
- 
+@@ -3982,6 +3986,37 @@ static void test_GetSecurityInfo(void)
+     }
+     LocalFree(pSD);
+     CloseHandle(obj);
++
++    /* Obtain the "domain users" SID from the user SID */
 +    if (!AllocateAndInitializeSid(&sia, 4, *GetSidSubAuthority(user_sid, 0),
 +                                  *GetSidSubAuthority(user_sid, 1),
 +                                  *GetSidSubAuthority(user_sid, 2),
@@ -45,14 +47,6 @@ index 05da0ae..2cf18e0 100644
 +    sid_size = sizeof(domain_users_ptr);
 +    pCreateWellKnownSid(WinAccountDomainUsersSid, domain_sid, domain_users_sid, &sid_size);
 +    FreeSid(domain_sid);
-+
-     /* Create something.  Files have lots of associated security info.  */
-     obj = CreateFileA(myARGV[0], GENERIC_READ|WRITE_DAC, FILE_SHARE_READ, NULL,
-                       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-@@ -3982,6 +3998,24 @@ static void test_GetSecurityInfo(void)
-     }
-     LocalFree(pSD);
-     CloseHandle(obj);
 +
 +    /* Test querying the ownership of a process */
 +    ret = pGetSecurityInfo(GetCurrentProcess(), SE_KERNEL_OBJECT,
diff --git a/patches/13-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch b/patches/13-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
index b71141e8..c4409a92 100644
--- a/patches/13-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
+++ b/patches/13-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch
@@ -1,6 +1,6 @@
-From 83880f60c7b647123815acb945c090bec17bab47 Mon Sep 17 00:00:00 2001
+From 7e00c939d05fbb097fa22a60fed2e920587f8de6 Mon Sep 17 00:00:00 2001
 From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
-Date: Wed, 14 May 2014 08:14:46 -0600
+Date: Wed, 25 Jun 2014 11:51:05 -0600
 Subject: server: Add default security descriptor DACL for processes.
 
 ---
@@ -9,7 +9,7 @@ Subject: server: Add default security descriptor DACL for processes.
  2 files changed, 76 insertions(+), 2 deletions(-)
 
 diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
-index 2cf18e0..f767512 100644
+index 2fb57c4..900c3ff 100644
 --- a/dlls/advapi32/tests/security.c
 +++ b/dlls/advapi32/tests/security.c
 @@ -3858,10 +3858,12 @@ static void test_GetSecurityInfo(void)
@@ -33,7 +33,7 @@ index 2cf18e0..f767512 100644
      DWORD ret;
  
      if (!pGetSecurityInfo || !pSetSecurityInfo)
-@@ -4016,6 +4019,53 @@ static void test_GetSecurityInfo(void)
+@@ -4017,6 +4020,53 @@ static void test_GetSecurityInfo(void)
      ok(group != NULL, "group should not be NULL\n");
      ok(EqualSid(group, domain_users_sid), "Process group SID != Domain Users SID.\n");
      LocalFree(pSD);