diff --git a/net-wireless/bluemaho/Manifest b/net-wireless/bluemaho/Manifest
index c3ffe1002..7910082e9 100644
--- a/net-wireless/bluemaho/Manifest
+++ b/net-wireless/bluemaho/Manifest
@@ -1,2 +1,3 @@
-DIST BlueMaho?action=AttachFile&do=get&target=bluemaho_v080422_beta.tar.gz 787754 RMD160 9b521600a9b1b955e7695e01476d102ce3385ca1 SHA1 10b28ba6e19d513c68510fc8ec7a5d13c30a65f9 SHA256 8e303c7eccf6783be90dbc8ce4edd951c83e623c1e6313b8db11a31b3c44b4fd
-EBUILD bluemaho-080422_beta.ebuild 967 RMD160 67c22c1d14d5283ef72f3574137fbc49261201d0 SHA1 9a377c1612a3e03d6bcb4d855920288341c83602 SHA256 d64d51e89b2a70ff7bbdc7c5fadb5681df0bb522f7aab40a6de3b3a24dc60e35
+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
diff --git a/net-wireless/bluemaho/bluemaho-080422_beta.ebuild b/net-wireless/bluemaho/bluemaho-090417.ebuild
similarity index 72%
rename from net-wireless/bluemaho/bluemaho-080422_beta.ebuild
rename to net-wireless/bluemaho/bluemaho-090417.ebuild
index 00c6fa81c..3a568c15c 100644
--- a/net-wireless/bluemaho/bluemaho-080422_beta.ebuild
+++ b/net-wireless/bluemaho/bluemaho-090417.ebuild
@@ -1,30 +1,29 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /root/portage/net-wireless/btscanner/btscanner-2.1.ebuild,v 1.1.1.1 2006/03/09 22:54:57 grimmlin Exp $
-
+EAPI=2
 inherit eutils
 
 MY_P="${PN}_v${PV}"
 
 DESCRIPTION="BlueMaho is GUI-shell (interface) for suite of tools for testing security of bluetooth devices"
 HOMEPAGE="http://wiki.thc.org/BlueMaho"
-SRC_URI="http://wiki.thc.org/BlueMaho?action=AttachFile&do=get&target=${MY_P}.tar.gz"
+SRC_URI="http://wiki.thc.org/BlueMaho?action=AttachFile&do=get&target=${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 S="${WORKDIR}/${MY_P}"
-RDEPEND="net-wireless/bluez-utils
-	 net-wireless/bt-audit"
+RDEPEND="net-wireless/bluez-utils[test-programs]
+	 net-wireless/bt-audit
+	 dev-libs/libxml2"
 DEPEND="${RDEPEND}"
 
 src_compile() {
-	if ! ( built_with_use test-programs net-wireless/bluez-utils ) ; then
-		eerror "net-wireless/bluez-utils must be built with USE=\"test-programs\""
-		die "Dependencies not met"
-	fi
 	cd src
+	epatch "${FILESDIR}/btftp-libxml.patch"
+	
 	emake || die "emake failed"
 }
 src_install() {
diff --git a/net-wireless/bluemaho/files/btftp-libxml.patch b/net-wireless/bluemaho/files/btftp-libxml.patch
new file mode 100644
index 000000000..d63add349
--- /dev/null
+++ b/net-wireless/bluemaho/files/btftp-libxml.patch
@@ -0,0 +1,21 @@
+diff -Naur bluemaho-090417.orig/tools/sources/btftp-0.1/Makefile bluemaho-090417/tools/sources/btftp-0.1/Makefile
+--- bluemaho-090417.orig/tools/sources/btftp-0.1/Makefile	2009-04-17 17:37:30.000000000 +0000
++++ bluemaho-090417/tools/sources/btftp-0.1/Makefile	2009-05-12 13:31:50.000000000 +0000
+@@ -1,2 +1,2 @@
+ all: obex.c sdp.c folder.c main.c
+-	gcc -lbluetooth -lopenobex -lreadline -lxml2 obex.c sdp.c folder.c main.c -o btftp
++	gcc -I/usr/include/libxml2/ -lbluetooth -lopenobex -lreadline -lxml2 obex.c sdp.c folder.c main.c -o btftp
+diff -Naur bluemaho-090417.orig/tools/sources/btftp-0.1/folder.c bluemaho-090417/tools/sources/btftp-0.1/folder.c
+--- bluemaho-090417.orig/tools/sources/btftp-0.1/folder.c	2009-04-17 17:37:30.000000000 +0000
++++ bluemaho-090417/tools/sources/btftp-0.1/folder.c	2009-05-12 13:31:26.000000000 +0000
+@@ -29,8 +29,8 @@
+ #include <time.h>
+ #include <sys/param.h>
+ 
+-#include <gnome-xml/xmlmemory.h>
+-#include <gnome-xml/parser.h>
++#include <libxml/xmlmemory.h>
++#include <libxml/parser.h>
+ 
+ #include "goep.h"
+ #include "ftp.h"