diff --git a/net-misc/openssh/openssh-5.7p1.bep b/net-misc/openssh/openssh-5.7p1.bep
new file mode 100644
index 000000000..d71864663
--- /dev/null
+++ b/net-misc/openssh/openssh-5.7p1.bep
@@ -0,0 +1,47 @@
+DESCRIPTION="OpenSSH" 
+HOMEPAGE="http://www.openssh.com/" 
+SRC_URI="http://www.mindrot.org/openssh_snap/openssh-SNAP-20110107.tar.gz"
+REVISION="1"
+STATUS_HAIKU="stable"
+DEPEND="dev-libs/openssl >= 1.0.0
+	dev-libs/libedit >= 20090923"
+CHECKSUM_MD5="f10b667e5e71d0e48c31ec0eebbc71e0"
+BUILD {
+	cd openssh
+	autoconf
+	mkdir -p m4
+	cp /boot/common/share/aclocal/libtool.m4 m4
+	cp /boot/common/share/aclocal/ltoptions.m4 m4
+	cp /boot/common/share/aclocal/ltversion.m4 m4
+	cp /boot/common/share/aclocal/ltsugar.m4 m4
+	cp /boot/common/share/aclocal/lt~obsolete.m4 m4
+	echo 'AC_CONFIG_MACRO_DIR([m4])' >> configure.ac
+	libtoolize --force --copy
+	aclocal -I m4
+	autoconf
+	./configure --prefix=`finddir B_COMMON_DIRECTORY` \
+	--sbindir=`finddir B_COMMON_BIN_DIRECTORY` \
+	--bindir=`finddir B_COMMON_BIN_DIRECTORY` \
+	--libexecdir=`finddir B_COMMON_LIB_DIRECTORY` \
+	--sysconfdir=`finddir B_USER_SETTINGS_DIRECTORY`/ssh \
+	--libdir=`finddir B_COMMON_LIB_DIRECTORY` \
+	--includedir=`finddir B_COMMON_DIRECTORY`/include \
+	--datadir=`finddir B_COMMON_DATA_DIRECTORY` \
+	--mandir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`/man \
+	--docdir=`finddir B_COMMON_DOCUMENTATION_DIRECTORY` \
+	--sysconfdir=`finddir B_COMMON_SETTINGS_DIRECTORY`/ssh \
+	--with-default-path=${PATH} \
+	--with-md5-passwords \
+	--disable-utmpx \
+	--with-libedit
+	make
+}
+
+INSTALL {
+	cd openssh
+	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
+}
+LICENSE="OpenSSH"
+COPYRIGHT="2005-2011 Tatu Ylonen et al."
diff --git a/net-misc/openssh/sshd_keymaker.sh b/net-misc/openssh/sshd_keymaker.sh
index 53ffb377f..ec3ed83a6 100755
--- a/net-misc/openssh/sshd_keymaker.sh
+++ b/net-misc/openssh/sshd_keymaker.sh
@@ -15,19 +15,24 @@ mkdir -p ${SETTINGSSSHDIR}
 
 hostKeyDir=${SETTINGSSSHDIR}
 
-_progress 0.0 "rsa1"
+
 if [ ! -f "$hostKeyDir/ssh_host_key" ] ; then
+	_progress 0.2 "rsa1"
 	ssh-keygen -t rsa1 -f "$hostKeyDir/ssh_host_key" -N ""
 fi
 
-_progress 0.3 "dsa"
 if [ ! -f "$hostKeyDir/ssh_host_dsa_key" ] ; then
+	_progress 0.4 "dsa"
 	ssh-keygen -t dsa -f "$hostKeyDir/ssh_host_dsa_key" -N ""
 fi
 
-_progress 0.6 "rsa"
-if [ ! -f "$hostKeyDir/ssh_host_rsa_key" ] ; then
-	ssh-keygen -t rsa -f "$hostKeyDir/ssh_host_rsa_key" -N ""
+if [ ! -f "$hostKeyDir/ssh_host_ecdsa_key" ] ; then
+	_progress 0.6 "ecdsa"
+	ssh-keygen -t ecdsa -f "$hostKeyDir/ssh_host_ecdsa_key" -N ""
 fi
 
-_progress 1.0 ""
+if [ ! -f "$hostKeyDir/ssh_host_rsa_key" ] ; then
+	_progress 0.8 "rsa"
+	ssh-keygen -t rsa -f "$hostKeyDir/ssh_host_rsa_key" -N ""
+	_progress 1.0 ""
+fi