# git diff
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 152d30af5..add279238 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -39,7 +39,7 @@ x509_CONFLICTS_INSTALL=               openssh-portable openssh-portable-hpn \
                                openssh-portable-gssapi
 x509_PKGNAMESUFFIX=            -portable-x509
 
-gssapi_BROKEN=         GSSAPI not yet updated for ${DISTVERSION}
+#gssapi_BROKEN=                GSSAPI not yet updated for ${DISTVERSION}
 x509_BROKEN=           X509 not yet updated for ${DISTVERSION} - Does anyone use this? Contact maintainer bdrewery@FreeBSD.org
 OPTIONS_DEFINE=                DOCS PAM TCP_WRAPPERS LIBEDIT BSM \
                        HPN X509 KERB_GSSAPI \
@@ -101,7 +101,9 @@ ETCDIR?=            ${PREFIX}/etc/ssh
 
 .include <bsd.port.pre.mk>
 
-PATCH_SITES+=          http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
+#PATCH_SITES+=         http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn,gsskex
+PATCH_SITES+=          http://mirror.shatow.net/freebsd/${PORTNAME}/:DEFAULT,x509,hpn \
+                                       http://sources.debian.org/data/main/o/openssh/1:8.0p1-3/debian/patches/:gsskex
 
 # X509 patch includes TCP Wrapper support already
 .if ${PORT_OPTIONS:MX509}
@@ -120,7 +122,8 @@ EXTRA_PATCHES:=             ${EXTRA_PATCHES:N${TCP_WRAPPERS_EXTRA_PATCHES}}
 # Needed glue for applying HPN patch without conflict
 EXTRA_PATCHES+=        ${FILESDIR}/extra-patch-hpn-gss-glue
 .  endif
-PATCHFILES+=   openssh-7.9p1-gsskex-all-20141021-debian-rh-20181020.patch.gz:-p1:gsskex
+#PATCHFILES+=  openssh-7.9p1-gsskex-all-20141021-debian-rh-20181020.patch.gz:-p1:gsskex
+PATCHFILES+=   gssapi.patch:-p1:gsskex
 .endif
 
 # https://www.psc.edu/hpn-ssh https://github.com/rapier1/openssh-portable/tree/hpn-openssl1.1-7_7_P1
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index d957d0d10..1c5ed6b81 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,7 +1,5 @@
-TIMESTAMP = 1562109185
+TIMESTAMP = 1563542470
 SHA256 (openssh-8.0p1.tar.gz) = bd943879e69498e8031eb6b7f44d08cdc37d59a7ab689aa0b437320c3481fd68
 SIZE (openssh-8.0p1.tar.gz) = 1597697
-SHA256 (openssh-7.9p1+x509-11.5.diff.gz) = 1d15099ce54614f158f10f55b6b4992d915353f92a05e179a64b0655650c00bb
-SIZE (openssh-7.9p1+x509-11.5.diff.gz) = 594995
-SHA256 (openssh-7.9p1-gsskex-all-20141021-debian-rh-20181020.patch.gz) = a9fe46bc97ebb6f32dad44c6e62e712b224392463b2084300835736fe848eabc
-SIZE (openssh-7.9p1-gsskex-all-20141021-debian-rh-20181020.patch.gz) = 27612
+SHA256 (gssapi.patch) = 6e07d74626915246d500eeaf9bfb23b1329d6e204d81ba67c09c9c237626c250
+SIZE (gssapi.patch) = 128374