diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index aed790deef6f..3a3ded2e8ab8 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -92,10 +92,9 @@ CONFIGURE_ARGS+=	--disable-suid-ssh
 .if !defined(WITHOUT_KERBEROS)
 .if defined(KRB5_HOME) && exists(${KRB5_HOME}) || defined(WITH_GSSAPI)
 .if defined(WITH_KERB_GSSAPI)
-BROKEN=			Waiting new upstream patch
 PATCH_DIST_STRIP=	-p0
 PATCH_SITES+=		http://www.sxw.org.uk/computing/patches/
-PATCHFILES+=		openssh-4.6p1-gsskex-20070312.patch
+PATCHFILES+=		openssh-4.7p1-gsskex-20070927.patch
 .endif
 PORTABLE_SUFFIX=	# empty
 GSSAPI_SUFFIX=		-gssapi
@@ -140,7 +139,7 @@ BROKEN=			HPN and LPK patches are incompatible
 .if defined(WITH_HPN)
 PATCH_DIST_STRIP=	-p1
 PATCH_SITES+=		http://www.psc.edu/networking/projects/hpn-ssh/
-PATCHFILES+=		openssh-4.7p1-hpn12v18.diff.gz
+PATCHFILES+=		openssh-4.7p1-hpn12v19.diff.gz
 .endif
 
 # See http://dev.inversepath.com/trac/openssh-lpk
diff --git a/security/openssh-portable/distinfo b/security/openssh-portable/distinfo
index c9f1d0729d7d..a6c819701891 100644
--- a/security/openssh-portable/distinfo
+++ b/security/openssh-portable/distinfo
@@ -1,12 +1,12 @@
 MD5 (openssh-4.7p1.tar.gz) = 50a800fd2c6def9e9a53068837e87b91
 SHA256 (openssh-4.7p1.tar.gz) = d47133f0c6737d2889bf8da7bdf389fc2268d1c7fa3cd11a52451501eab548bc
 SIZE (openssh-4.7p1.tar.gz) = 991119
-MD5 (openssh-4.6p1-gsskex-20070312.patch) = 9607f2faa8a50078d74f1169b5040599
-SHA256 (openssh-4.6p1-gsskex-20070312.patch) = d4f94d0a046ef1ada973faa4815d8af4d74ca068213e34b8537d6ac313895f92
-SIZE (openssh-4.6p1-gsskex-20070312.patch) = 69637
-MD5 (openssh-4.7p1-hpn12v18.diff.gz) = 5b536701ee999a29bb622c2f41745ef8
-SHA256 (openssh-4.7p1-hpn12v18.diff.gz) = 45e6ea24e2722cab9b4e143952bf6539024aa8cc93353b88807c910330bb735b
-SIZE (openssh-4.7p1-hpn12v18.diff.gz) = 16094
+MD5 (openssh-4.7p1-gsskex-20070927.patch) = ad58a9848dcaa3ad5a2ab14182fb9212
+SHA256 (openssh-4.7p1-gsskex-20070927.patch) = 7ef9009baa842c696d356c7e5e5d022797a227531c1662dd998510e45a6dd597
+SIZE (openssh-4.7p1-gsskex-20070927.patch) = 66693
+MD5 (openssh-4.7p1-hpn12v19.diff.gz) = befa2e169944d1d32216cbf35d182a96
+SHA256 (openssh-4.7p1-hpn12v19.diff.gz) = 60ba4bfd986f5ee21394387bc8ffd87bd1f2e16c5e8853b7896327faf1595bf3
+SIZE (openssh-4.7p1-hpn12v19.diff.gz) = 15122
 MD5 (openssh-lpk-4.6p1-0.3.9.patch) = f43a8aae7d69e72f0ec07bc96e46b328
 SHA256 (openssh-lpk-4.6p1-0.3.9.patch) = e12335e8bf020508ea3866db07b306f4c965e3f9de262c06f62fad494e93107e
 SIZE (openssh-lpk-4.6p1-0.3.9.patch) = 61605