diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep
new file mode 100644
index 000000000..267ade287
--- /dev/null
+++ b/net-misc/openssh/openssh-5.4p1.bep
@@ -0,0 +1,41 @@
+DESCRIPTION="OpenSSH" 
+HOMEPAGE="http://www.openssh.com/" 
+SRC_URI="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz"
+REVISION="1"
+STATUS_HAIKU="broken"
+DEPEND="openssl"
+CHECKSUM_MD5="f9132326c2575c1be0aefc2be62a7db1"
+BUILD {
+	cd openssh-5.4p1
+	libtoolize --force --copy
+	aclocal
+	autoconf
+	automake
+	./configure --prefix=/boot/common \
+	--sbindir=/boot/common/bin \
+	--bindir=/boot/common/bin \
+	--libexecdir=/boot/common/bin \
+	--with-md5-passwords \
+  	--sysconfdir=/boot/home/4 \
+  	--sharedstatedir=/boot/home/5 \
+  	--localstatedir=/boot/home/6 \
+  	--libdir=/boot/home/7 \
+  	--includedir=/boot/home/8 \
+  	--oldincludedir=/boot/home/9 \
+  	--datarootdir=/boot/home/10 \
+  	--datadir=/boot/home/11 \
+  	--infodir=/boot/home/12 \
+  	--localedir=/boot/home/13 \
+  	--mandir=/boot/home/14 \
+  	--docdir=/boot/home/15 \
+  	--htmldir=/boot/home/16 \
+  	--dvidir=/boot/home/17 \
+  	--pdfdir=/boot/home/18 \
+  	--psdir=/boot/home/19
+	make
+}
+
+INSTALL {
+	cd openssh-5.4p1
+	make install
+}
diff --git a/net-misc/openssh/patches/openssh-5.4p1.patch b/net-misc/openssh/patches/openssh-5.4p1.patch
new file mode 100644
index 000000000..6b2669972
--- /dev/null
+++ b/net-misc/openssh/patches/openssh-5.4p1.patch
@@ -0,0 +1,35 @@
+diff -urN openssh-5.4p1/configure.ac openssh-5.4p1-haiku/configure.ac
+--- openssh-5.4p1/configure.ac	2010-03-05 04:04:35.015990784 +0000
++++ openssh-5.4p1-haiku/configure.ac	2010-03-16 09:39:10.537133056 +0000
+@@ -488,6 +488,11 @@
+ *-*-dragonfly*)
+ 	SSHDLIBS="$SSHDLIBS -lcrypt"
+ 	;;
++*-*-haiku*) 
++    LIBS="$LIBS -lbsd "
++    AC_CHECK_LIB(network, socket)
++    MANTYPE=man 
++    ;; 
+ *-*-hpux*)
+ 	# first we define all of the options common to all HP-UX releases
+ 	CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1"
+@@ -2648,6 +2653,19 @@
+ 	)
+ fi
+ 
++if test -z "$have_u_int64_t" ; then
++    AC_MSG_CHECKING([for u_int64_t type in posix/stdint.h])
++	AC_TRY_COMPILE(
++		[ #include <posix/stdint.h> ],
++		[ u_int64_t a; a = 1],
++		[
++			AC_DEFINE(HAVE_U_INT64_T)
++			AC_MSG_RESULT(yes)
++		],
++		[ AC_MSG_RESULT(no) ]
++	)
++fi
++
+ if test -z "$have_u_intxx_t" ; then
+ 	AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
+ 		AC_TRY_COMPILE(