diff --git a/net-p2p/twister/Manifest b/net-p2p/twister/Manifest
index 735c0b9..f397a74 100644
--- a/net-p2p/twister/Manifest
+++ b/net-p2p/twister/Manifest
@@ -1,4 +1,4 @@
-AUX 0.9.07_beta-twister-qt.pro.patch 846 SHA256 79bac6fd3324cb110c143c69b329ebd0eb82f3872bcdf291567120b3a037bf67 SHA512 776c0abf594c2b67a1f782d48c3a3fe72466fe9ac149cd0135a63450144ef75d75c70e0e471cff4cb757eeb6a7c9b2b6f15e55465148126e7317779bbff286bb WHIRLPOOL bbcf104598fdf5cc5be6ef9af241286d4878ff0ca7d3dd5751dc5552931aa35b102e26439991462260eee08f7e871d257595958e71bfc491f10cb1d8789f48f0
+AUX 0.9.07_beta-db.h.patch 251 SHA256 375c737447a42900138ccb946756bf384cc3d1430aaf51044f67a0d231b55255 SHA512 dda8f378d5988f127cea88f0ff5e3b732d8fc27f82c778054377481c172b445635060c3d1dfb7046498cb30b4d33ccaa9b46cafc5eb5bdaa590b9bc095a9b6d0 WHIRLPOOL 7403098919f0871fe3573a77e236aa96e94a64b62d47d5d6e9c2869df5be07333b6c3d95ee67a2f1c67bd8014bb69bc54e64487e3883b111046797d60885e739
 DIST 1df2b24f9088ebcbb1fe39902b4c608677c1462d.tar.gz 6259174 SHA256 f50a7c3d56bae92a97580e3f7bcad93b5b36808120fd3f196e56bf001f621c3a SHA512 99159b60e8bfd9c026edbde6cf4805d3b7930eaf22e4d8cd6ae536578869847b3d832ec42b362d22e323fc57794adfd13485b504ad5fa2534725e145794c3e5d WHIRLPOOL 770eb4fd2f0a80c169cab01095726dcb9ac5cb4410648ae2793bf2e541a821443f05c92e04637a98be4ad4379e1e0024665bb3120d387db46550937782681264
-EBUILD twister-0.9.07_beta.ebuild 783 SHA256 953db3728cd04b6fa7164ba3f492adb4579a51c010b02424a4ae2a8ec00ec781 SHA512 440e77fd5392ffbec32c0113a35a9209de3975a5a6869f4b8a84f89aa9dfe61e0a60918c30f06af16eb1667005db8857eef48df1a220b8972c666b3021bb6c9b WHIRLPOOL b674bb566718894c6ad6ac666ac81075d030846a0865ea6130cdc1ac92298fdb50021af79d50927a64f9d797d1dfda47b378cfce7bd9231a8f6512760dead61d
+EBUILD twister-0.9.07_beta.ebuild 656 SHA256 b18011cb2f182675b71678ce6c74889bb30b3b661a86d5a5ec30e77aaa62f41d SHA512 f19ef802bcfc84feec4599c825d0b5aed19aa1f39ca6282fa36f381f6aefacdfcf581b2d309487f3d9ecc6c547ad03ed959fae4f97f4febc583666d151be164f WHIRLPOOL 5d06280ddd0bafbd5b9fecc915dcba7b6cc5b1d080b709c349c0eba31fd781ae0c717d772d4775d5c115291380ec89922143076474f7f8ae88e8b90a6bd47a7f
 MISC metadata.xml 239 SHA256 706991ed05293634d82104cb89aab861d8b96d8aa41234481a7b82984a98c0a2 SHA512 f2986e44d85df0351e7c3ff8d9ed2da4c62c1824aa11e9849c36bc1161f21d40e3d9561501e586f11cf14acd79d09f33bce6a10fcce799396257966b008a96e9 WHIRLPOOL 0c772e7b22d79df020d5e743426f09ff7ecdd7ebb97cb3557dd92d38d8f78e5a13eb7e16a463d760db5f3ec5d85c170c4eee44e6555fe2d1ac9b48c0742e589f
diff --git a/net-p2p/twister/files/0.9.07_beta-db.h.patch b/net-p2p/twister/files/0.9.07_beta-db.h.patch
new file mode 100644
index 0000000..fa9ba7b
--- /dev/null
+++ b/net-p2p/twister/files/0.9.07_beta-db.h.patch
@@ -0,0 +1,13 @@
+diff --git a/src/db.h b/src/db.h
+index b3f269f..bb494c5 100644
+--- a/src/db.h
++++ b/src/db.h
+@@ -13,7 +13,7 @@
+ #include <vector>
+ 
+ #include <boost/filesystem.hpp>
+-#include <db_cxx.h>
++#include DB_CXX_HEADER
+ 
+ class CAddrMan;
+ class CBlockLocator;
diff --git a/net-p2p/twister/files/0.9.07_beta-twister-qt.pro.patch b/net-p2p/twister/files/0.9.07_beta-twister-qt.pro.patch
deleted file mode 100644
index b1227da..0000000
--- a/net-p2p/twister/files/0.9.07_beta-twister-qt.pro.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/twister-qt.pro b/twister-qt.pro
-index 841791f..070c480 100644
---- a/twister-qt.pro
-+++ b/twister-qt.pro
-@@ -452,8 +452,13 @@ LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
- # -lgdi32 has to happen after -lcrypto (see  #681)
- win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
- LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
--win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
--macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
-+
-+contains(USE_BOOST_46,1) {
-+    message(Building with boost 1.4.6. Excluding chrono library.)
-+} else {
-+    message(Building with boost over 1.4.6. Including chrono library.)
-+    LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
-+}
- 
- contains(RELEASE, 1) {
-     !win32:!macx {
diff --git a/net-p2p/twister/twister-0.9.07_beta.ebuild b/net-p2p/twister/twister-0.9.07_beta.ebuild
index c4cab79..a98ad87 100644
--- a/net-p2p/twister/twister-0.9.07_beta.ebuild
+++ b/net-p2p/twister/twister-0.9.07_beta.ebuild
@@ -22,16 +22,12 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/twister-core-${COMMIT}"
 
 src_configure() {
-	cd "${S}/libtorrent"
-	./bootstrap.sh
-	econf --enable-logging --enable-debug --enable-dht
-
-	cd "${S}"
-	qmake BDB_INCLUDE_PATH=/usr/include/db4.8
+	./autotool.sh
+	./configure
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-twister-qt.pro.patch"
+	epatch "${FILESDIR}/${PV}-db.h.patch"
 }
 
 src_compile() {