diff --git a/net-misc/openssh/openssh-6.1p1.bep b/net-misc/openssh/openssh-6.1p1.bep
index cdcc3883b..774fd80b5 100644
--- a/net-misc/openssh/openssh-6.1p1.bep
+++ b/net-misc/openssh/openssh-6.1p1.bep
@@ -43,7 +43,8 @@ INSTALL {
 }
 
 TEST {
-	cd openssh
+	cd openssh-6.1p1
+
 	make tests
 }
 
diff --git a/net-misc/openssh/openssh-6.2p1.bep b/net-misc/openssh/openssh-6.2p1.bep
index 76e3b7b92..478b6ea04 100644
--- a/net-misc/openssh/openssh-6.2p1.bep
+++ b/net-misc/openssh/openssh-6.2p1.bep
@@ -1,16 +1,15 @@
 DESCRIPTION="OpenSSH" 
 HOMEPAGE="http://www.openssh.com/" 
-SRC_URI="http://www.mindrot.org/openssh_snap/openssh-SNAP-20130312.tar.gz"
-#SRC_URI="http://openbsd.mirrorcatalogs.com/pub/OpenBSD/OpenSSH/portable/openssh-6.2p1.tar.gz"
+SRC_URI="http://ftp5.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-6.2p1.tar.gz"
 REVISION="1"
 STATUS_HAIKU="stable"
 DEPEND="dev-libs/openssl >= 1.0.0
 	dev-libs/libedit >= 20090923"
-CHECKSUM_MD5="9a91b46c2dcfbd9ee8fb4505627ca31d"
+CHECKSUM_MD5="7b2d9dd75b5cf267ea1737ec75500316"
 BUILD {
-#	cd openssh-6.2p1
-	cd openssh
-    sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' Makefile.in
+	cd openssh-6.2p1
+#	sed -i 's/"\$(PRIVSEP_PATH)\\" \\/\"$(PRIVSEP_PATH)\"/g' 
+#Makefile.in
 	autoconf
 	mkdir -p m4
 	aclocal --install -I m4
@@ -39,15 +38,14 @@ BUILD {
 }
 
 INSTALL {
-#	cd openssh-6.2p1
-	cd openssh
+	cd openssh-6.2p1
 	make install DESTDIR="${DESTDIR}"
 	mkdir -p ${DESTDIR}/boot/common/boot/post_install
 	cp -f $(haikuporter -t)/net-misc/openssh/sshd_keymaker.sh ${DESTDIR}/boot/common/boot/post_install
 }
 
 TEST {
-	cd openssh
+	cd openssh-6.2p1
 	make tests
 }