diff --git a/security/hpn-ssh/Makefile b/security/hpn-ssh/Makefile
index 7ea6157a902e..a082ab89b890 100644
--- a/security/hpn-ssh/Makefile
+++ b/security/hpn-ssh/Makefile
@@ -133,6 +133,11 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
+test:
+	(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} \
+	PATH=${PREFIX}/bin:${PREFIX}/sbin:${PATH} \
+	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} )
+
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/security/openssl/Makefile.ssl"
diff --git a/security/hpn-ssh/files/patch-Makefile.in b/security/hpn-ssh/files/patch-Makefile.in
index 417599cccc87..728554f4249c 100644
--- a/security/hpn-ssh/files/patch-Makefile.in
+++ b/security/hpn-ssh/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Wed Jun 26 01:45:42 2002
-+++ Makefile.in	Wed Jul  3 07:27:14 2002
++++ Makefile.in	Mon Jul 22 07:24:41 2002
 @@ -70,6 +70,8 @@
  MANPAGES_IN	= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
  MANTYPE		= @MANTYPE@
@@ -9,3 +9,12 @@
  CONFIGFILES=sshd_config.out ssh_config.out moduli.out
  CONFIGFILES_IN=sshd_config ssh_config moduli
  
+@@ -218,7 +220,7 @@
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)
+-	chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
++	-chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
+ 	$(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
+ 	$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
+ 	$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
diff --git a/security/hpn-ssh/files/patch-stderr-after-eof.sh b/security/hpn-ssh/files/patch-stderr-after-eof.sh
new file mode 100644
index 000000000000..38969b8d51a3
--- /dev/null
+++ b/security/hpn-ssh/files/patch-stderr-after-eof.sh
@@ -0,0 +1,11 @@
+--- regress/stderr-after-eof.sh.orig	Wed May  1 05:17:35 2002
++++ regress/stderr-after-eof.sh	Fri Jul 19 07:22:18 2002
+@@ -7,7 +7,7 @@
+ DATA=${OBJ}/data
+ COPY=${OBJ}/copy
+ 
+-MD5=md5sum
++MD5=md5
+ 
+ # setup data
+ rm -f ${DATA} ${COPY}
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index 7ea6157a902e..a082ab89b890 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -133,6 +133,11 @@ post-install:
 	@${CAT} ${PKGMESSAGE}
 .endif
 
+test:
+	(cd ${WRKSRC}/regress && ${SETENV} ${MAKE_ENV} \
+	PATH=${PREFIX}/bin:${PREFIX}/sbin:${PATH} \
+	${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} )
+
 .include <bsd.port.pre.mk>
 
 .include "${PORTSDIR}/security/openssl/Makefile.ssl"
diff --git a/security/openssh-portable/files/patch-Makefile.in b/security/openssh-portable/files/patch-Makefile.in
index 417599cccc87..728554f4249c 100644
--- a/security/openssh-portable/files/patch-Makefile.in
+++ b/security/openssh-portable/files/patch-Makefile.in
@@ -1,5 +1,5 @@
 --- Makefile.in.orig	Wed Jun 26 01:45:42 2002
-+++ Makefile.in	Wed Jul  3 07:27:14 2002
++++ Makefile.in	Mon Jul 22 07:24:41 2002
 @@ -70,6 +70,8 @@
  MANPAGES_IN	= scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5
  MANTYPE		= @MANTYPE@
@@ -9,3 +9,12 @@
  CONFIGFILES=sshd_config.out ssh_config.out moduli.out
  CONFIGFILES_IN=sshd_config ssh_config moduli
  
+@@ -218,7 +220,7 @@
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)8
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(libexecdir)
+ 	$(srcdir)/mkinstalldirs $(DESTDIR)$(PRIVSEP_PATH)
+-	chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
++	-chmod 0700 $(DESTDIR)$(PRIVSEP_PATH)
+ 	$(INSTALL) -m 0755 -s ssh $(DESTDIR)$(bindir)/ssh
+ 	$(INSTALL) -m 0755 -s scp $(DESTDIR)$(bindir)/scp
+ 	$(INSTALL) -m 0755 -s ssh-add $(DESTDIR)$(bindir)/ssh-add
diff --git a/security/openssh-portable/files/patch-stderr-after-eof.sh b/security/openssh-portable/files/patch-stderr-after-eof.sh
new file mode 100644
index 000000000000..38969b8d51a3
--- /dev/null
+++ b/security/openssh-portable/files/patch-stderr-after-eof.sh
@@ -0,0 +1,11 @@
+--- regress/stderr-after-eof.sh.orig	Wed May  1 05:17:35 2002
++++ regress/stderr-after-eof.sh	Fri Jul 19 07:22:18 2002
+@@ -7,7 +7,7 @@
+ DATA=${OBJ}/data
+ COPY=${OBJ}/copy
+ 
+-MD5=md5sum
++MD5=md5
+ 
+ # setup data
+ rm -f ${DATA} ${COPY}