diff --git a/openssh-6.7p1-coverity.patch b/openssh-6.7p1-coverity.patch
index f29d8cf..4d99125 100644
--- a/openssh-6.7p1-coverity.patch
+++ b/openssh-6.7p1-coverity.patch
@@ -156,17 +156,19 @@ diff -up openssh-8.5p1/dns.c.coverity openssh-8.5p1/dns.c
  			}
  		}
 diff -up openssh-8.5p1/gss-genr.c.coverity openssh-8.5p1/gss-genr.c
---- openssh-8.5p1/gss-genr.c.coverity	2021-03-24 13:32:05.030213908 +0100
-+++ openssh-8.5p1/gss-genr.c	2021-03-24 13:42:50.967034823 +0100
-@@ -167,7 +167,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
+--- openssh-8.5p1/gss-genr.c.coverity	2021-03-26 11:52:46.613942552 +0100
++++ openssh-8.5p1/gss-genr.c	2021-03-26 11:54:37.881726318 +0100
+@@ -167,8 +167,9 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
  			enclen = __b64_ntop(digest,
  			    ssh_digest_bytes(SSH_DIGEST_MD5), encoded,
  			    ssh_digest_bytes(SSH_DIGEST_MD5) * 2);
 -
-+			/* coverity[-Wstringop-overflow: FALSE]*/
++#pragma GCC diagnostic ignored "-Wstringop-overflow"
  			cp = strncpy(s, kex, strlen(kex));
++#pragma pop
  			for ((p = strsep(&cp, ",")); p && *p != '\0';
  				(p = strsep(&cp, ","))) {
+ 				if (sshbuf_len(buf) != 0 &&
 diff -up openssh-8.5p1/kexgssc.c.coverity openssh-8.5p1/kexgssc.c
 --- openssh-8.5p1/kexgssc.c.coverity	2021-03-24 12:03:33.711967665 +0100
 +++ openssh-8.5p1/kexgssc.c	2021-03-24 12:03:33.783968166 +0100
@@ -255,8 +257,8 @@ diff -up openssh-8.5p1/misc.c.coverity openssh-8.5p1/misc.c
  	}
  	if (nullfd > STDERR_FILENO)
  		close(nullfd);
-+	/* coverity [leaked_handle : FALSE]*/
-+	/* coverity [leaked_handle : FALSE]*/
++	/* coverity[leaked_handle : FALSE]*/
++	/* coverity[leaked_handle : FALSE]*/
  }
  
  char *
@@ -264,7 +266,7 @@ diff -up openssh-8.5p1/misc.c.coverity openssh-8.5p1/misc.c
  	}
  	if (devnull > STDERR_FILENO)
  		close(devnull);
-+	/* coverity [leaked_handle : FALSE]*/
++	/* coverity[leaked_handle : FALSE]*/
  	return ret;
  }