diff --git a/net-wireless/ubertooth/Manifest b/net-wireless/ubertooth/Manifest
index 56a4a5f56..2e990ba2a 100644
--- a/net-wireless/ubertooth/Manifest
+++ b/net-wireless/ubertooth/Manifest
@@ -1,3 +1,2 @@
 AUX 40-ubertooth.rules 80 RMD160 a9905a761fa0ca83cde0979e7772cbf5c94aebb9 SHA1 951809ccf7a68b940dd7b446a76778ca48b17ea1 SHA256 3c6b1bf40ef12bcfd33071adbdf7983c010b6af2d7db273182d73916a4365f2a
-AUX makefile.patch 1779 RMD160 cdf685db2a6de4bbdc4dd501f70f990233010860 SHA1 d08b7085ceeb52916dceb23fc08599d03f5b573a SHA256 8bda636ae8e2e24d07d34bb63aad8f031777f217147f8afbfb095ed04064c653
-EBUILD ubertooth-9999.ebuild 2016 RMD160 666790cab9a9a838f2a7625d318e7113c14c43ff SHA1 5aba7ce511cf0812ae6859ed51278a97721b904c SHA256 582bf88d710dea1f7b1d2dd25220688b5cb006932116a3c11495ce6de244043a
+EBUILD ubertooth-9999.ebuild 2008 RMD160 c6bee00f1dec5ea778415c9074a6a85c8892b8ed SHA1 189c2161b3d6db1e46fdf6338ceb240fad32ff6b SHA256 5bf97250e3540b268c4f33f2fe621e02c8c2ed1f8aa09cc9d1b0e026c65abdae
diff --git a/net-wireless/ubertooth/files/makefile.patch b/net-wireless/ubertooth/files/makefile.patch
deleted file mode 100644
index 34a8f2eb7..000000000
--- a/net-wireless/ubertooth/files/makefile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur trunk-orig/host/kismet/plugin-ubertooth/Makefile trunk/host/kismet/plugin-ubertooth/Makefile
---- trunk-orig/host/kismet/plugin-ubertooth/Makefile	2011-05-31 20:08:49.000000000 -0400
-+++ trunk/host/kismet/plugin-ubertooth/Makefile	2011-05-31 20:29:49.000000000 -0400
-@@ -2,6 +2,7 @@
- KIS_INC_DIR ?= $(KIS_SRC_DIR)
- RXTX_SRC_DIR ?= ../../bluetooth_rxtx
- RXTX_INC_DIR ?= $(RXTX_SRC_DIR)
-+LIBDIR ?= /lib
- 
- include $(KIS_SRC_DIR)/Makefile.inc
- 
-@@ -11,6 +12,7 @@
- PLUGINLDFLAGS ?= $(LDFLAGS)
- PLUGINLDFLAGS += -shared -rdynamic
- LIBS	+= -lstdc++ -lusb-1.0 -lpthread -lbtbb
-+CFLAGS	?= $(CFLAGS) $(CPPFLAGS)
- CFLAGS	+= -I/usr/include -I$(KIS_INC_DIR) -I$(RXTX_INC_DIR) -g -fPIC
- 
- SRVOBJS = packetsource_ubertooth.o packet_btbb.o packet_btbb_types.o \
-@@ -23,16 +25,16 @@
- all:	$(SRVOUT) $(CLIOUT)
- 
- $(CLIOUT):	$(CLIOBJS)
--	$(LD) $(PLUGINLDFLAGS) $(CLIOBJS) -o $(CLIOUT) $(LIBS)
-+	$(CC) $(PLUGINLDFLAGS) $(CFLAGS) $(CLIOBJS) -o $(CLIOUT) $(LIBS)
- 
- $(SRVOUT):	$(SRVOBJS)
--	$(LD) $(PLUGINLDFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
-+	$(CC) $(PLUGINLDFLAGS) $(CFLAGS) $(SRVOBJS) -o $(SRVOUT) $(LIBS)
- 
- install:	$(SRVOUT) $(CLIOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/lib/kismet/$(SRVOUT)
--	mkdir -p $(DESTDIR)$(prefix)/lib/kismet_client/
--	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/lib/kismet_client/$(CLIOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(SRVOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet/$(SRVOUT)
-+	mkdir -p $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/
-+	install -o $(INSTUSR) -g $(INSTGRP) -m 644 $(CLIOUT) $(DESTDIR)$(prefix)/$(LIBDIR)/kismet_client/$(CLIOUT)
- 
- 
- userinstall:	$(SRVOUT) $(CLIOUT)
diff --git a/net-wireless/ubertooth/ubertooth-9999.ebuild b/net-wireless/ubertooth/ubertooth-9999.ebuild
index eb44a0bba..27843f162 100644
--- a/net-wireless/ubertooth/ubertooth-9999.ebuild
+++ b/net-wireless/ubertooth/ubertooth-9999.ebuild
@@ -30,12 +30,11 @@ RDEPEND=">=net-wireless/kismet-2011.03.2-r1 \
 
 ESVN_REPO_URI="https://ubertooth.svn.sourceforge.net/svnroot/ubertooth/trunk/host"
 
-
 src_compile() {
 	cd "${WORKDIR}/${P}/bluetooth_rxtx"
 	emake
 	use python && cd "${WORKDIR}"/${P}/bluetooth_rxtx/python
-	use python && python setup.py build --prefix="${ED}"
+	use python && python setup.py build
 }
 
 src_install() {
@@ -43,9 +42,9 @@ src_install() {
 		  bluetooth_rxtx/ubertooth-specan bluetooth_rxtx/ubertooth-uap \
 		  bluetooth_rxtx/ubertooth-util
 
-	use specan && dobin specan_ui/specan.py specan_ui/specan_ui.py
+	use specan && dobin specan_ui/specan.py specan_ui/ubertooth-specan-ui
 
-	use dfu && dobin usb_dfu/usb_dfu.py
+	use dfu && dobin usb_dfu/ubertooth-dfu
 
 	use python && cd "${WORKDIR}"/${P}/bluetooth_rxtx/python
 	use python && python setup.py install --prefix="${ED}"