diff --git a/net-misc/openssh/openssh-5.4p1.bep b/net-misc/openssh/openssh-5.4p1.bep
index 81f58e883..74603ef24 100644
--- a/net-misc/openssh/openssh-5.4p1.bep
+++ b/net-misc/openssh/openssh-5.4p1.bep
@@ -1,14 +1,21 @@
 DESCRIPTION="OpenSSH" 
 HOMEPAGE="http://www.openssh.com/" 
-#SRC_URI="ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz
+SRC_URI="http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-5.4p1.tar.gz"
 REVISION="1"
-STATUS_HAIKU="broken"
+STATUS_HAIKU="stable"
 DEPEND="openssl"
 CHECKSUM_MD5="da10af8a789fa2e83e3635f3a1b76f5e"
 BUILD {
 	cd openssh-5.4p1
-	libtoolize --force --copy
-	aclocal
+	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 --install
+	aclocal -I m4
 	autoconf
 	automake
 	./configure --prefix=/boot/common \
@@ -16,22 +23,6 @@ BUILD {
 	--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
 }