diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest
index a1f71d3..21ce28a 100644
--- a/net-im/palaver/Manifest
+++ b/net-im/palaver/Manifest
@@ -1,5 +1,6 @@
-AUX palaver-initd 591 RMD160 ef204804fd79cf9eb94844c3996ebc83df8bd9b0 SHA1 c466e8a1c15bd3253f9c62556add5005821a2998 SHA256 657fee78bf4343714c0c9a1c81ff23bcdec75130c18dea0b5e79eae2625fc9ed
+AUX palaver-initd 595 RMD160 91a53b5ed72956a21b0e5d3ebc590f21a9564e3e SHA1 96b470069ecc47b6302cff2efa686f9d78a6cea4 SHA256 bbc830878d4b3cc288f0982dcca187e1dd10089b1f923867423c6ce249187917
 DIST palaver-0.5.tar.bz2 72495 RMD160 b831f5f0fd05982d420b7d2e4d5c47c2927b4e17 SHA1 c64d1ac46102a94f8432005439e26459c26a74dd SHA256 431f0be33a77287a45fc4ed5947dfbb4cff487122e87bfa80c636520df4baad4
 DIST palaver-0.6.tar.bz2 71431 RMD160 d1eac261b4ea9263d6992d17d5498f27b054643b SHA1 6e33a77322a432f5c20e6b05dea93ee10d6e4d5d SHA256 437a32250f7ba2a7b07e1dae894893ae4bf32e8a7d8d8e97a4803c9fee4dde26
 EBUILD palaver-0.5.ebuild 1412 RMD160 c1044dbcc0d0a3f36960a65e4ba0cedec54b8305 SHA1 973e07e9c938234773ecd86b1ea6c6bea6fa94c9 SHA256 b7003bf855eee6c02285baf356ceca8c895a0a604104b792be60c610b12888cf
+EBUILD palaver-0.6-r1.ebuild 1429 RMD160 ecf996431024fa7b0c8577f8dbe74690fc97d223 SHA1 25e3643d2903ceaea2fd51b025f1422eab3b51ee SHA256 aa89dcff2673eca5665bc4344aab11163f0b7f64c918f5d99294acade2b0e54f
 EBUILD palaver-0.6.ebuild 1412 RMD160 c1044dbcc0d0a3f36960a65e4ba0cedec54b8305 SHA1 973e07e9c938234773ecd86b1ea6c6bea6fa94c9 SHA256 b7003bf855eee6c02285baf356ceca8c895a0a604104b792be60c610b12888cf
diff --git a/net-im/palaver/files/palaver-initd b/net-im/palaver/files/palaver-initd
index 8424c77..27262fc 100644
--- a/net-im/palaver/files/palaver-initd
+++ b/net-im/palaver/files/palaver-initd
@@ -11,7 +11,7 @@ depend() {
 start() {
 	ebegin "Starting Palaver MUC service"
 	start-stop-daemon --start --pidfile /var/run/jabber/palaver.pid --chuid jabber:jabber \
-		--exec /usr/bin/twistd -- -f /etc/jabber/palaver.tap -l /var/log/jabber/palaver.log \
+		--exec /usr/bin/twistd-2.6 -- -f /etc/jabber/palaver.tap -l /var/log/jabber/palaver.log \
 		--pidfile /var/run/jabber/palaver.pid
 	eend $?
 }
diff --git a/net-im/palaver/palaver-0.6-r1.ebuild b/net-im/palaver/palaver-0.6-r1.ebuild
new file mode 100644
index 0000000..1b4d121
--- /dev/null
+++ b/net-im/palaver/palaver-0.6-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+NEED_PYTHON=2.6
+
+inherit eutils python distutils
+DESCRIPTION="Multi-user chat component for jabber implemented in python"
+HOMEPAGE="http://code.stanziq.com/palaver"
+SRC_URI="http://code.stanziq.com/cgit/${PN}/${PN}/snapshot/${P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+DEPEND="net-im/jabber-base"
+RDEPEND=">=dev-python/twisted-2.4.0
+>=dev-python/twisted-words-0.5
+${DEPEND}"
+
+src_unpack() {
+	unpack ${A} && cd "${S}" || die "unpack failed"
+}
+
+src_compile() {
+	# nothing to be done here?
+	distutils_src_compile
+}
+
+src_install() {
+	distutils_src_install
+
+	insinto /etc/jabber
+	newins example-config.xml ${PN}.xml
+	fperms 600 /etc/jabber/${PN}.xml
+	fowners jabber:jabber /etc/jabber/${PN}.xml
+	dosed \
+		"s:<spool>[^\<]*</spool>:<spool>/var/spool/jabber</spool>:" \
+		/etc/jabber/${PN}.xml
+
+#	dosed \
+#		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
+#		/etc/jabber/${PN}.xml
+
+	newinitd "${FILESDIR}/${PN}-initd" ${PN}
+#	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
+
+}
+
+pkg_postinst() {
+	einfo "A sample config file has been installed into /etc/jabber/${PN}.xml."
+	einfo "Please adjust the settings as needed."
+	einfo "After that, you MUST create a TAP-file for twisted in order to start Palaver, like this:"
+	einfo "# cd /etc/jabber"
+	einfo "# mktap palaver -c palaver.xml"
+}