diff --git a/net-wireless/btscanner/Manifest b/net-wireless/btscanner/Manifest
index e35eae35c..44477b721 100644
--- a/net-wireless/btscanner/Manifest
+++ b/net-wireless/btscanner/Manifest
@@ -1,16 +1,2 @@
-DIST btscanner-2.0.tar.bz2 365677 RMD160 447ed6d2fc35441cbe56b372ccbfa9cd4b1aeeae SHA1 4d78f346fd319582049b418fdfde6770a02081ba SHA256 017b1b022118d7dad371d65ab4b6f4d6d7be99482a4af3facd9360ce55210780
 DIST btscanner-2.1.tar.bz2 442492 RMD160 ada5323aae528a017215c38ea5dd08ddeddc1b55 SHA1 9396bc977ea9b33ebf4f699628f0cdd66688529d SHA256 7fc6e81dc64bdfe8bbca23aea9cd74d7be5a29210ef9620704c180b1a0f929d0
-EBUILD btscanner-2.0.ebuild 694 RMD160 a46288b0dfcde9aa58948b65ad51fd0ede05ba51 SHA1 79d75f37d84ed7d64c2ab600adb2ca0fb8db4a78 SHA256 00bbf23d2018d1a784763681d06c104aaf697bda197fb87ee40c9400d5e31d5e
-MD5 2b0a51983ce0ad3ff7ae7bb3929e44a9 btscanner-2.0.ebuild 694
-RMD160 a46288b0dfcde9aa58948b65ad51fd0ede05ba51 btscanner-2.0.ebuild 694
-SHA256 00bbf23d2018d1a784763681d06c104aaf697bda197fb87ee40c9400d5e31d5e btscanner-2.0.ebuild 694
-EBUILD btscanner-2.1-r1.ebuild 823 RMD160 077284be217153aa5c4aea7ea2e2ff448bb56ffd SHA1 f47352f56b41f917968a8de009bd9608c695ef73 SHA256 6382434244241d241cb072bbbef0b89e92d9b6a67dc5d4eb0c991e4601b9f3e9
-MD5 cec484c364ef401d13911a7e1ab8c68f btscanner-2.1-r1.ebuild 823
-RMD160 077284be217153aa5c4aea7ea2e2ff448bb56ffd btscanner-2.1-r1.ebuild 823
-SHA256 6382434244241d241cb072bbbef0b89e92d9b6a67dc5d4eb0c991e4601b9f3e9 btscanner-2.1-r1.ebuild 823
-MD5 24ef1fc889ef0033ae208033ffd3f4a9 files/digest-btscanner-2.0 244
-RMD160 ea765446230049e71069c682a324341b2bbdcb69 files/digest-btscanner-2.0 244
-SHA256 cd9e936bfd84be0f3bb681b9b1b2ee269ba19fd5b544001869a5df6cf3135371 files/digest-btscanner-2.0 244
-MD5 7dd740a75f5975273505c19b7bf13755 files/digest-btscanner-2.1-r1 244
-RMD160 3cfe0828885c79654678d86f724fd56a9fd5c968 files/digest-btscanner-2.1-r1 244
-SHA256 5153efc0a3f573ebc0f0ffc12cbb33c171945715a2a0f920fbb345bea9271464 files/digest-btscanner-2.1-r1 244
+EBUILD btscanner-2.1-r2.ebuild 983 RMD160 e111efc99f076ba4449d09ba660a3c8b18e40d70 SHA1 f8cd0d92b5d36c61c277a4f3fa357d215b0a610c SHA256 2237bdf97d38458e3fd4036041008285ec837b1f866c0a0c51974bf3d6f86942
diff --git a/net-wireless/btscanner/btscanner-2.0.ebuild b/net-wireless/btscanner/btscanner-2.0.ebuild
deleted file mode 100644
index 3e14310b2..000000000
--- a/net-wireless/btscanner/btscanner-2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /root/portage/net-wireless/btscanner/btscanner-2.0.ebuild,v 1.1.1.1 2006/02/27 20:03:41 grimmlin Exp $
-
-inherit eutils
-
-DESCRIPTION="A utility for bluetooth scanning and discovery"
-HOMEPAGE="http://www.pentest.co.uk/cgi-bin/viewcat.cgi?cat=downloads"
-SRC_URI="http://www.pentest.co.uk/src/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=net-wireless/bluez-utils-2.15
-	>=net-wireless/bluez-libs-2.15
-	>=dev-libs/libxml2-2.6
-	>sys-libs/ncurses-5.4*"
-
-src_install() {
-	einstall || die "install failed"
-	dodoc AUTHORS ChangeLog README NEWS TODO USAGE
-}
diff --git a/net-wireless/btscanner/btscanner-2.1-r1.ebuild b/net-wireless/btscanner/btscanner-2.1-r2.ebuild
similarity index 77%
rename from net-wireless/btscanner/btscanner-2.1-r1.ebuild
rename to net-wireless/btscanner/btscanner-2.1-r2.ebuild
index e0634695e..ce764266e 100644
--- a/net-wireless/btscanner/btscanner-2.1-r1.ebuild
+++ b/net-wireless/btscanner/btscanner-2.1-r2.ebuild
@@ -20,10 +20,11 @@ DEPEND=">=net-wireless/bluez-utils-2.15
 
 src_compile() {
 	sed -i -e 's/-Wimplicit-function-dec //g' configure*
-	econf || die "econf failed"
+	sed -i -e '/dtd/ s:/usr/local/:/:' -e '/oui/ s:local/share:share/btscanner:' btscanner.xml
+	econf --datadir="/usr/share/btscanner" || die "econf failed"
 	emake || die "emake failed"
 }
 src_install() {
-	einstall || die "install failed"
+	einstall datadir="${D}/usr/share/btscanner" || die "install failed"
 	dodoc AUTHORS ChangeLog README NEWS TODO USAGE
 }
diff --git a/net-wireless/btscanner/files/digest-btscanner-2.0 b/net-wireless/btscanner/files/digest-btscanner-2.0
deleted file mode 100644
index f72f6ef62..000000000
--- a/net-wireless/btscanner/files/digest-btscanner-2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1cb558f02bb6707fa1c160b78b490404 btscanner-2.0.tar.bz2 365677
-RMD160 447ed6d2fc35441cbe56b372ccbfa9cd4b1aeeae btscanner-2.0.tar.bz2 365677
-SHA256 017b1b022118d7dad371d65ab4b6f4d6d7be99482a4af3facd9360ce55210780 btscanner-2.0.tar.bz2 365677
diff --git a/net-wireless/btscanner/files/digest-btscanner-2.1-r1 b/net-wireless/btscanner/files/digest-btscanner-2.1-r1
deleted file mode 100644
index 5b7a576f8..000000000
--- a/net-wireless/btscanner/files/digest-btscanner-2.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 587ec5847647d432eac1704b260af020 btscanner-2.1.tar.bz2 442492
-RMD160 ada5323aae528a017215c38ea5dd08ddeddc1b55 btscanner-2.1.tar.bz2 442492
-SHA256 7fc6e81dc64bdfe8bbca23aea9cd74d7be5a29210ef9620704c180b1a0f929d0 btscanner-2.1.tar.bz2 442492