diff --git a/openssh-8.7p1-upstream-cve-2021-41617.patch b/openssh-8.7p1-upstream-cve-2021-41617.patch
index 15d49f2..ec9b839 100644
--- a/openssh-8.7p1-upstream-cve-2021-41617.patch
+++ b/openssh-8.7p1-upstream-cve-2021-41617.patch
@@ -1,15 +1,15 @@
-diff --git a/misc.c b/misc.c
+diff --git a/auth.c b/auth.c
 index b8d1040d..0134d694 100644
---- a/misc.c
-+++ b/misc.c
+--- a/auth.c
++++ b/auth.c
 @@ -56,6 +56,7 @@
- #ifdef HAVE_PATHS_H
  # include <paths.h>
+ #endif
  #include <pwd.h>
 +#include <grp.h>
+ #ifdef HAVE_LOGIN_H
+ #include <login.h>
  #endif
- #ifdef SSH_TUN_OPENBSD
- #include <net/if.h>
 @@ -2695,6 +2696,12 @@ subprocess(const char *tag, const char *command,
  		}
  		closefrom(STDERR_FILENO + 1);
@@ -20,6 +20,6 @@ index b8d1040d..0134d694 100644
 +			    pw->pw_name, (u_int)pw->pw_gid, strerror(errno));
 +			_exit(1);
 +		}
+		/* Don't use permanently_set_uid() here to avoid fatal() */
  		if (setresgid(pw->pw_gid, pw->pw_gid, pw->pw_gid) == -1) {
  			error("%s: setresgid %u: %s", tag, (u_int)pw->pw_gid,
- 			    strerror(errno));