diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 7a0e3c5d13a3..c9d36efb4d73 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openssh
 PORTVERSION=	3.4p1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/hpn-ssh/files/patch-sshd.c b/security/hpn-ssh/files/patch-sshd.c
new file mode 100644
index 000000000000..09665a42d7bd
--- /dev/null
+++ b/security/hpn-ssh/files/patch-sshd.c
@@ -0,0 +1,31 @@
+--- sshd.c.orig	Wed Jun 26 01:24:19 2002
++++ sshd.c	Thu Jul 25 06:32:37 2002
+@@ -53,6 +53,10 @@
+ #include <prot.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <resolv.h>
++#endif
++
+ #include "ssh.h"
+ #include "ssh1.h"
+ #include "ssh2.h"
+@@ -1409,6 +1413,17 @@
+ 	    setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on,
+ 	    sizeof(on)) < 0)
+ 		error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
++
++#ifdef __FreeBSD__
++	/*
++	 * Initialize the resolver.  This may not happen automatically
++	 * before privsep chroot().                                   
++	 */
++	if ((_res.options & RES_INIT) == 0) {
++		debug("res_init()");         
++		res_init();         
++	}
++#endif
+ 
+ 	/*
+ 	 * Register our connection.  This turns encryption off because we do
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 7a0e3c5d13a3..c9d36efb4d73 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	openssh
 PORTVERSION=	3.4p1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security ipv6
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
 		ftp://ftp.op.net/pub/OpenBSD/OpenSSH/portable/ \
diff --git a/security/openssh-portable/files/patch-sshd.c b/security/openssh-portable/files/patch-sshd.c
new file mode 100644
index 000000000000..09665a42d7bd
--- /dev/null
+++ b/security/openssh-portable/files/patch-sshd.c
@@ -0,0 +1,31 @@
+--- sshd.c.orig	Wed Jun 26 01:24:19 2002
++++ sshd.c	Thu Jul 25 06:32:37 2002
+@@ -53,6 +53,10 @@
+ #include <prot.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <resolv.h>
++#endif
++
+ #include "ssh.h"
+ #include "ssh1.h"
+ #include "ssh2.h"
+@@ -1409,6 +1413,17 @@
+ 	    setsockopt(sock_in, SOL_SOCKET, SO_KEEPALIVE, &on,
+ 	    sizeof(on)) < 0)
+ 		error("setsockopt SO_KEEPALIVE: %.100s", strerror(errno));
++
++#ifdef __FreeBSD__
++	/*
++	 * Initialize the resolver.  This may not happen automatically
++	 * before privsep chroot().                                   
++	 */
++	if ((_res.options & RES_INIT) == 0) {
++		debug("res_init()");         
++		res_init();         
++	}
++#endif
+ 
+ 	/*
+ 	 * Register our connection.  This turns encryption off because we do