diff --git a/net-p2p/twister/Manifest b/net-p2p/twister/Manifest
index d18a111..9d5b30f 100644
--- a/net-p2p/twister/Manifest
+++ b/net-p2p/twister/Manifest
@@ -1,6 +1,6 @@
 AUX twister-html-install 1378 SHA256 e77abf70a36e13fc1bf284f514f243fcd8ba1acf6bd68971270e184ed470abeb SHA512 880fd3cf098ce9063cf06c2851a303def774add071ae8d51781dc6a291de73521765a3cdc13d1e922eaae8ecdc70189c3956d1c14a6eb6f8339dafad202787eb WHIRLPOOL 2684657eec378e987ad157518d78fd106a69f924b37ec6672d1623d69a18409c334818232ff30d237e5ecbce6578f1d2b0e23b9e44d3f96ec0ae9397a18b8ace
 AUX twister-html-update 398 SHA256 6627875c8820fcd401c975d451880808a35d0496ca0f12343a33e9bf90d34026 SHA512 e5613a3c774e9350be5b8fa2aadc4cb8c57e8addd97304a92184871a1f6ad35fc9e833c75c57515b7071a704277cb870fd401fa7eaed0f8d28376bb6917e8614 WHIRLPOOL ee8ad3451c50c011eff36ba1e16cf0eb8b2e46ee50d5a454ac318816f54f0d581a91a2404a9a36946be647378577702a8098f0c70283093f4d87fd6706a2e3aa
 DIST 6b157f10c05f22a1999551746f9dd40980019bce.tar.gz 6218432 SHA256 94c1a3d6a26451d8b64da16b81ec790c33c426f2e595a3efca15335bd560c735 SHA512 e3d73c78e9b91db43e58e41de6645342eb8a930a86136550465a10ace40eb235bb5b80a75b1269b0d629f7cae92f1e63c613994965422c8eafb81325a878afcb WHIRLPOOL 6ec75721be3dedd4f9871c1d3760c3bdd1bc34c18c55f892936e543f53aad3dd3a09e7728527e52300c3304c0b638d9f7addd0d5cabf607c6bcbb83558fbed45
-EBUILD twister-0.9.39.ebuild 1152 SHA256 80b286318d6395acd5ce3ed676c890c56f9d95e4d339fcbfb93c490370d1e1b0 SHA512 183ab4687a521cac421dcde8ffac79b4a75e85420db38dd6fe161163b0111f8c60685ff0d86a9cd9a66756ee8816fcf03fd2f52de03676244f49fcc819068c52 WHIRLPOOL 704fe8d7eee7d2761d7a51d70523bfd87bedcd3512441203fd694b6b9d735edaa5e77c33b8850d727f2b0ee10deb1aabab21c99b9ef6eb1784e39d8bb0ad583e
+EBUILD twister-0.9.39.ebuild 1239 SHA256 ac5186c8a2c7874ee2ebd58e889e6ed3a8115525084aad04d02f06285eb454cc SHA512 f9fa2447d134b99d7ac20325c3b2414743f10dc87c8c89a33030e736ae574948b4296ab01eb625cadd03915d73f64b70f2610cd7a6df29001ab0762ad5932c31 WHIRLPOOL 4c465ca9cf0672dd3cd16bf361cadb44befda75e087639623d7ea492c47c8eba56d765e38d6e2450abb8cfc53ab5a810e4d018294e880b5b6da8d302c31bba17
 EBUILD twister-9999.ebuild 1123 SHA256 33d6f3c2173f430c74b6f685695b362f398d3c33875e34c9b26579d36f59bb1a SHA512 6934575b91f20f0c737f5b5fe67668d9f1925b416db2b705fc80803232a66d84b5afde4210c07376752b273d7a77e812c8e4615e982b7602805dd3c410bbbc80 WHIRLPOOL af30d86db28261e3b49b0c19cb26dafde24a3a499206c6113fb21b194add369b5bdc1ed444c324ec6ed554c4a73a60b3f5cb40a7c0bb834d6ff885c0c63589d0
 MISC metadata.xml 233 SHA256 64eef535474fbc710fadceed478a7cbee7054993e2b41afc8a624e26040aa9de SHA512 35143a73e1054a65d6ce2adf66b8d3b520dca3aeefe540dcbeee509319378e760c3bc6d42a9ae3829422368e5802737264909af52a910a4e4158b0bcfa253d1c WHIRLPOOL 2a0321f1c2f54853fce3a1c1c0a60738674217fb621411bcd62cfa25e427cef1ccb375ce25595af117a1dc4e1f85150df88321fc8af78a019bf09deeb395e60b
diff --git a/net-p2p/twister/twister-0.9.39.ebuild b/net-p2p/twister/twister-0.9.39.ebuild
index 1c22208..4bbd8a4 100644
--- a/net-p2p/twister/twister-0.9.39.ebuild
+++ b/net-p2p/twister/twister-0.9.39.ebuild
@@ -15,7 +15,7 @@ IUSE="tk"
 
 RDEPEND="dev-libs/openssl:*[-bindist]
 	sys-libs/db:4.8
-	dev-libs/boost:0/1.56.0
+	dev-libs/boost
 	net-libs/miniupnpc
 	tk? ( || ( dev-lang/python:2.7[tk] dev-lang/python:2.6[tk] ) )"
 
@@ -24,7 +24,7 @@ DEPEND="${RDEPEND}"
 S="${WORKDIR}/twister-core-${COMMIT}"
 
 src_configure() {
-	./bootstrap.sh
+	./bootstrap.sh CPPFLAGS="-fpermissive"
 }
 
 src_compile() {
@@ -34,8 +34,10 @@ src_compile() {
 src_install() {
 	einstall
 
+	rm -f "${D}/usr/share/applications/mimeinfo.cache"
+	use tk || rm -fr "${D}/usr/share/pixmaps"
 	use tk || rm -f "${D}/usr/bin/twister-control"
-	use tk || rm -f "${D}/usr/share/applications/twister-control.desktop"
+	use tk || rm -fr "${D}/usr/share/applications"
 
 	exeinto "/usr/bin/"
 	doexe "${FILESDIR}/twister-html-install"