diff --git a/net-wireless/bluemaho/Manifest b/net-wireless/bluemaho/Manifest
index 7910082e9..4f47c8058 100644
--- a/net-wireless/bluemaho/Manifest
+++ b/net-wireless/bluemaho/Manifest
@@ -1,3 +1,4 @@
+AUX bluemaho 50 RMD160 cebb4ff4c66cb943be41657308af2361db0ce411 SHA1 e79152cfde43f31cf7ff2c1c3a08ff359dec0219 SHA256 1623940d95c958f9dcdb0c5dd8e114dc16431baa9a4c0a1ddc8d44c52022a876
 AUX btftp-libxml.patch 1065 RMD160 c2bb428225879824bb9c30e25790821664c0ec5f SHA1 16911c47c073a82d291b787a894ce3db04dfcbb4 SHA256 c8b83e3fad9952c5a0dd47daff487c896df86c3bed635da715af842322f093c5
 DIST BlueMaho?action=AttachFile&do=get&target=bluemaho_v090417.tgz 916884 RMD160 57ed5b2967ef659b8e2a80bb8d3ff3908e27341b SHA1 216db6f836b20b7f70f3a56bec95ab0a607a2af5 SHA256 9b36bcf73a59d7c03a2262287c4aa37fbd308801d6fa4d3cbc86b9d15ad7ff1c
-EBUILD bluemaho-090417.ebuild 866 RMD160 a5d9ca02559a16c9fbca759972225da41b473026 SHA1 b122532c54c91aec30bfaa7ec526c517a749d18f SHA256 021c38b9a7f8964ef2bda2a45dd2ad57027e723958cb6669662bc68fedf7f8eb
+EBUILD bluemaho-090417.ebuild 1068 RMD160 90d406d7602c33d43129503af20d34d97946a00b SHA1 fc69ae930eb5fd1e7fb0e75a24a415eb6b85109e SHA256 c79e88478379950ab5bbdc3a977949194cc1fff792fa5790b1e8412a88aaed9d
diff --git a/net-wireless/bluemaho/bluemaho-090417.ebuild b/net-wireless/bluemaho/bluemaho-090417.ebuild
index 3a568c15c..816324d34 100644
--- a/net-wireless/bluemaho/bluemaho-090417.ebuild
+++ b/net-wireless/bluemaho/bluemaho-090417.ebuild
@@ -14,19 +14,26 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
-S="${WORKDIR}/${MY_P}"
 RDEPEND="net-wireless/bluez-utils[test-programs]
+	 net-wireless/bluez-libs
 	 net-wireless/bt-audit
-	 dev-libs/libxml2"
+	 dev-libs/libxml2
+	 dev-python/wxpython
+	 dev-libs/libusb
+	 sys-libs/readline"
 DEPEND="${RDEPEND}"
+S="${WORKDIR}/${MY_P/_v/-}"
 
 src_compile() {
-	cd src
 	epatch "${FILESDIR}/btftp-libxml.patch"
-	
-	emake || die "emake failed"
+	cd ${S}
+	sed -e 's/Eterm/xterm/'	-i config/default.conf
+	cd config
+	sh build.sh || die "emake failed"
 }
+
 src_install() {
-	dobin src/psm_scan src/rfcomm_scan
-	dodoc CHANGELOG README THANKS
+	dodir /usr/lib/${PN}
+	cp -R "${S}"/* "${D}"/usr/lib/${PN} || die "Copy files failed"
+	dobin "${FILESDIR}/${PN}"
 }
diff --git a/net-wireless/bluemaho/files/bluemaho b/net-wireless/bluemaho/files/bluemaho
new file mode 100644
index 000000000..4089d08b6
--- /dev/null
+++ b/net-wireless/bluemaho/files/bluemaho
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /usr/lib/bluemaho/
+./bluemaho.py $@