diff --git a/net-p2p/twister/Manifest b/net-p2p/twister/Manifest
index cde045d..0f36d42 100644
--- a/net-p2p/twister/Manifest
+++ b/net-p2p/twister/Manifest
@@ -1,9 +1,7 @@
 AUX twister-html-install 1378 SHA256 e77abf70a36e13fc1bf284f514f243fcd8ba1acf6bd68971270e184ed470abeb SHA512 880fd3cf098ce9063cf06c2851a303def774add071ae8d51781dc6a291de73521765a3cdc13d1e922eaae8ecdc70189c3956d1c14a6eb6f8339dafad202787eb WHIRLPOOL 2684657eec378e987ad157518d78fd106a69f924b37ec6672d1623d69a18409c334818232ff30d237e5ecbce6578f1d2b0e23b9e44d3f96ec0ae9397a18b8ace
 AUX twister-html-update 398 SHA256 6627875c8820fcd401c975d451880808a35d0496ca0f12343a33e9bf90d34026 SHA512 e5613a3c774e9350be5b8fa2aadc4cb8c57e8addd97304a92184871a1f6ad35fc9e833c75c57515b7071a704277cb870fd401fa7eaed0f8d28376bb6917e8614 WHIRLPOOL ee8ad3451c50c011eff36ba1e16cf0eb8b2e46ee50d5a454ac318816f54f0d581a91a2404a9a36946be647378577702a8098f0c70283093f4d87fd6706a2e3aa
-DIST 8a89202952da0e8cc5ff5b3316499cd09ff43e42.tar.gz 6287015 SHA256 4c4dd1262a3d477fffa28e3bcdd3e1a9c2dc0b288bb8b3243f5b8c6134b958b6 SHA512 63398258ebd1ae13f1f3ad5be12200b74ead6aa2e86b9a900631fb79adf59572f72e37e6c6c43d2a67b2f7b27e27b8bcbdd7c87e16a37a025d52976bf010c6cb WHIRLPOOL 072fb1ca2d7856935b16434661ba0b73dd0b0f16bb67316e24fe18d9aa352400e423d0efd6e00a8e66b7a076c06cd3ffd9ba14b451e11acbb7ac4cf92bdc092b
-DIST 9d3b0744ff2694f7d50981731d01ff3e0d86c3b1.tar.gz 6293735 SHA256 a9dba210332dae6c331146db01b85ab98169df8b7282bef51a53a02bde11e644 SHA512 ab71cec6a3598647295a9e350ae0dc421962a6d09d050cfe9d6327ef29913a3e4a8d6154ef263a79e827c2f10ce7ddc8f10b17a64f691aaf8b8cf59a82c7622e WHIRLPOOL 393e8f68d88c0a41c49a5d790388cb440f6cb0ace89b955c0dcbc97c7ccd5b01e1bcbca658de4fc11a73ccfa5e048e6924cf834ae635006a121891908e2b5c2c
+DIST 374364b9d613769d30f649fb991c0d7faf07c686.tar.gz 6197438 SHA256 84f6324a0966e76ed31882a04655c0a7a808f15f973ada7f15c05859178f49dd SHA512 8eb9af0938c25fb525c75c8999ae7a23d423a064e1bb2844afe90a1d18404125f3d01963685a255742069264690da5cc5ea2694c9d710475e506d3f7ffbb581d WHIRLPOOL fd6e1accab335b1648d60f772583add1b51dab2b4d9cc42f7a0a7fc9149cadc1b2ac82703e48f07bbb6b48aa451ac4deb93de81acc19c7908cce6653d0c92f41
 DIST b8e264f4d13354e9ae2bd387dfed7ea137a83424.tar.gz 6293797 SHA256 6733ae77b9699ed707eeae8551073e5cf472eed32c66be40b7c179fa611b5137 SHA512 8b9088ea6f74e5410268de529eb8bb021f0c593daa513e589ebbcdd23dd721d6a1284affbc41a5bf3249aecd67c0127f3109fc972ca7be6d0f9a244134e498ee WHIRLPOOL 674fe203c78206beb1c7c2010b2d51b84a41feb24758ffe39f799f48e6ff3087f14d751a0bbdffc57d4a1ee75470e8013283da764edf3878f75463acf0f0b472
-EBUILD twister-0.9.26_beta.ebuild 1004 SHA256 1078abd59d40209469adea976e3e65be975ff4132be84605243a7dfa7e1bbf26 SHA512 3961e94207aa999b5a80e25169069106359d02f09de519147e71ad66e59e529b2ce21fcf8c680e910699ac31d809984cdf2ac383fe0999251abd469105372800 WHIRLPOOL 2b5a853122b6e3ae77a0e56e2aa401394658949ffe25bfe6b8a3716692d431a559d0249d4ba72ddcf60c66acdc6a41e97df023f00e4685282266b2a3f4fd9943
-EBUILD twister-0.9.27_beta.ebuild 1004 SHA256 901a67d953d03871525b506138497a12d0edfede55e24124be3fa5a8d9f8a8f8 SHA512 4626369d15ff8269fed63e252f01505ae5f29bea9e5da3280e97b2581f17c3801c63336714b0c4c99738c5ee22b4708696e720015bc42c514a8bd2e75322a83a WHIRLPOOL 128f8bc79b003b9c7208846447e7a79b33f3b7cf40213ad751f026ef5ac0cb44986fc70705fa3129aca6d1c2e8c63f334968071bfdabfafbe3360890cded2a19
 EBUILD twister-0.9.28_beta.ebuild 1004 SHA256 28c927ad1ff409f01750acf84e26a90a126e3b9579dd97969851201d0987c063 SHA512 196091617f61daf38d1afcfc789114ed48b91ff173312acfaf746b6f3512edc1254f8561197f59302f6ade7afb6fee82ff6b1e32c6082f3944bcf5ce6973075a WHIRLPOOL f25ad75ac87a1c0a19be215dc3599e8e9fb34672aa1c291e0a5197bbcac0bcf227c0be4ad59a95ccbd69d4f220581f14202860e8f0c31ff3dd37dd3883813aef
+EBUILD twister-0.9.29_beta.ebuild 1143 SHA256 ee029f8fca6f7627f6f433df1253668a60817be585ad1647719cad9fd34fa1b2 SHA512 079ad6caacfd9d2be90215f6f6f4ad2effc211b6b2346852257b70d2def6134c3917c6c6538516cbbd6a61319dbc6cfca8db83b4291e030b00c6b8f5f8fc7320 WHIRLPOOL 415203ef3836347da2ec7570201666273638e8e29c065c7f9f8c816c471799c5ad11f747117a0e3704b467191e44c6f88b0ca989abbfb7dfdbcf82052631f8f9
 MISC metadata.xml 233 SHA256 64eef535474fbc710fadceed478a7cbee7054993e2b41afc8a624e26040aa9de SHA512 35143a73e1054a65d6ce2adf66b8d3b520dca3aeefe540dcbeee509319378e760c3bc6d42a9ae3829422368e5802737264909af52a910a4e4158b0bcfa253d1c WHIRLPOOL 2a0321f1c2f54853fce3a1c1c0a60738674217fb621411bcd62cfa25e427cef1ccb375ce25595af117a1dc4e1f85150df88321fc8af78a019bf09deeb395e60b
diff --git a/net-p2p/twister/twister-0.9.27_beta.ebuild b/net-p2p/twister/twister-0.9.27_beta.ebuild
deleted file mode 100644
index b0e9406..0000000
--- a/net-p2p/twister/twister-0.9.27_beta.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-EAPI=5
-inherit eutils
-
-COMMIT="9d3b0744ff2694f7d50981731d01ff3e0d86c3b1"
-
-DESCRIPTION="Peer-to-peer microblogging"
-HOMEPAGE="http://twister.net.co/"
-SRC_URI="https://github.com/miguelfreitas/twister-core/archive/${COMMIT}.tar.gz"
-RESTRICT="mirror"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl[-bindist]
-	sys-libs/db:4.8
-	dev-libs/boost
-	net-libs/miniupnpc"
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/twister-core-${COMMIT}"
-
-src_configure() {
-	./bootstrap.sh
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	dodir "/usr/bin/"
-
-	exeinto "/usr/bin"
-	doexe "${S}/twisterd" 
-	doexe "${FILESDIR}/twister-html-install"
-	doexe "${FILESDIR}/twister-html-update"
-
-	dodoc "${S}/README.md"
-}
-
-pkg_postinst() {
-	elog "Befor running twister, each user must set up twister's HTML files"
-	elog "in ~/.twister/html and the configs in ~/.twister/twister.conf."
-	elog "They can do this by running twister-html-install."
-	elog ""
-	elog "To keep the HTML files up to date, run twister-html-update."
-}
diff --git a/net-p2p/twister/twister-0.9.26_beta.ebuild b/net-p2p/twister/twister-0.9.29_beta.ebuild
similarity index 70%
rename from net-p2p/twister/twister-0.9.26_beta.ebuild
rename to net-p2p/twister/twister-0.9.29_beta.ebuild
index a17f75f..a8817f3 100644
--- a/net-p2p/twister/twister-0.9.26_beta.ebuild
+++ b/net-p2p/twister/twister-0.9.29_beta.ebuild
@@ -1,7 +1,7 @@
 EAPI=5
 inherit eutils
 
-COMMIT="8a89202952da0e8cc5ff5b3316499cd09ff43e42"
+COMMIT="374364b9d613769d30f649fb991c0d7faf07c686"
 
 DESCRIPTION="Peer-to-peer microblogging"
 HOMEPAGE="http://twister.net.co/"
@@ -11,11 +11,13 @@ RESTRICT="mirror"
 LICENSE="MIT BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="tk"
 
-RDEPEND="dev-libs/openssl[-bindist]
+RDEPEND="dev-libs/openssl:*[-bindist]
 	sys-libs/db:4.8
 	dev-libs/boost
-	net-libs/miniupnpc"
+	net-libs/miniupnpc
+	tk? ( || ( dev-lang/python:2.7[tk] dev-lang/python:2.6[tk] ) )"
 
 DEPEND="${RDEPEND}"
 
@@ -30,14 +32,14 @@ src_compile() {
 }
 
 src_install() {
-	dodir "/usr/bin/"
+	einstall
 
-	exeinto "/usr/bin"
-	doexe "${S}/twisterd" 
+	use tk || rm -f "${D}/usr/bin/twister-control"
+	use tk || rm -f "${D}/usr/share/applications/twister-control.desktop"
+
+	exeinto "/usr/bin/"
 	doexe "${FILESDIR}/twister-html-install"
 	doexe "${FILESDIR}/twister-html-update"
-
-	dodoc "${S}/README.md"
 }
 
 pkg_postinst() {