diff --git a/net-wireless/haraldscan/Manifest b/net-wireless/haraldscan/Manifest
deleted file mode 100644
index 0659debc1..000000000
--- a/net-wireless/haraldscan/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST MACLIST 10369 SHA256 335582afd0e87d97cc5856ffb8bc296b169955d367309f8d40ec8db96e27c7b6 SHA512 aa73ec9945ea0af033a40d496c834c694ac6c9359db2b1fa01a7475f7602d1b96ecf6aca4978e656a46b727c0991146157c3fe4e32a4e1cb0a5715017e3d1a57 WHIRLPOOL 684a209fee50f713bb3529292dc4a6a934c6305ab506351f30c74b91b092bbda8446a958a9ec33e943d7329b52b09452ac9d0864ddaaa40317fd993b1a22ca63
-DIST haraldscan-src-0.41.tar.gz 44183 SHA256 86e4620d92725b480cd956f91746457484c746062ffc22ea57e5cc58fd10b53e SHA512 ed823c78b5664c7b515c4964c7570453f9c5595c4f61c3daf4fb8c7c8a154ab8352226b70a9dbc2a1a03563fcae6a0d93d08ecd79ee730fcf19b087b31ef7d31 WHIRLPOOL 1a99b13498104e30fb2b4883a5b8b3e3ca19ae605ed8963651b6921f3a5c89785ff0233efb5ea8b36f6e055ccd812087310099fc2c89937bbe97cc18d2e9fc07
diff --git a/net-wireless/haraldscan/files/haraldscan-maclist-path.patch b/net-wireless/haraldscan/files/haraldscan-maclist-path.patch
deleted file mode 100644
index 3ef80ee03..000000000
--- a/net-wireless/haraldscan/files/haraldscan-maclist-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/haraldmodules/haraldupdate.py	2010-01-15 15:01:44.939988340 +0100
-+++ b/haraldmodules/haraldupdate.py	2010-01-15 15:01:58.978014426 +0100
-@@ -35,7 +35,7 @@
-     llines = 0
-     
-     
--    flocal = open('MACLIST', 'rb')
-+    flocal = open('/usr/share/haraldscan/MACLIST', 'rb')
-     
-     for line in flocal:
-         llines+=1
diff --git a/net-wireless/haraldscan/haraldscan-0.41.ebuild b/net-wireless/haraldscan/haraldscan-0.41.ebuild
deleted file mode 100644
index e4579fb81..000000000
--- a/net-wireless/haraldscan/haraldscan-0.41.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-
-PYTHON_DEPEND="2"
-
-inherit python eutils
-
-DESCRIPTION="A Bluetooth discovery scanner"
-HOMEPAGE="http://code.google.com/p/haraldscan/"
-SRC_URI="http://haraldscan.googlecode.com/files/${PN}-src-${PV}.tar.gz 
-	http://haraldscan.googlecode.com/svn/trunk/MACLIST"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="$RDEPEND"
-RDEPEND="dev-python/pybluez"
-
-#S="${WORKDIR}"/${PN}-${PV}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_unpack() {
-	mkdir "${S}"
-	cd "${S}"
-	unpack ${A}
-	cd "${S}"
-}
-src_prepare() {
-	epatch "${FILESDIR}"/haraldscan-maclist-path.patch
-}
-src_install() {
-	insinto $(python_get_sitedir)/haraldmodules
-	doins haraldmodules/*.py
-	dobin haraldscan.py
-	insinto /usr/share/haraldscan
-#	doins MACLIST
-	cp "${DISTDIR}"/MACLIST "${D}"/usr/share/${PN}/
-	dodoc doc/README
-}
-
-pkg_postinst() {
-	python_mod_optimize haraldmodules
-#	einfo "Updating MAC database..."
-#	haraldscan.py -u >/dev/null 2>&1 || true
-	elog "Run 'haraldscan.py -u' to create macinfo.db in a current directory"
-}
-
-pkg_postrm() {
-	python_mod_cleanup haraldmodules
-}
diff --git a/pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.0.ebuild b/pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.1.ebuild
similarity index 82%
rename from pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.0.ebuild
rename to pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.1.ebuild
index a79483caa..097b20006 100644
--- a/pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.0.ebuild
+++ b/pentoo/pentoo-bluetooth/pentoo-bluetooth-2017.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="5"
+EAPI=6
 
 DESCRIPTION="Pentoo bluetooth meta ebuild"
 HOMEPAGE="http://www.pentoo.ch"
@@ -19,5 +18,4 @@ PDEPEND="
 	net-wireless/crackle
 	net-wireless/kismet-ubertooth
 	net-wireless/ubertooth
-	net-wireless/haraldscan
 	>=net-wireless/blueman-1.23_p20140717"