diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest
index 37b9c75..0863f96 100644
--- a/net-im/palaver/Manifest
+++ b/net-im/palaver/Manifest
@@ -1,3 +1,5 @@
-AUX palaver-0.5-initd 591 RMD160 ef204804fd79cf9eb94844c3996ebc83df8bd9b0 SHA1 c466e8a1c15bd3253f9c62556add5005821a2998 SHA256 657fee78bf4343714c0c9a1c81ff23bcdec75130c18dea0b5e79eae2625fc9ed
+AUX palaver-initd 591 RMD160 ef204804fd79cf9eb94844c3996ebc83df8bd9b0 SHA1 c466e8a1c15bd3253f9c62556add5005821a2998 SHA256 657fee78bf4343714c0c9a1c81ff23bcdec75130c18dea0b5e79eae2625fc9ed
 DIST palaver-0.5.tar.gz 57702 RMD160 ebf2a9443187c715424eaaa3670a370d0851d598 SHA1 6cfdc251a1812bd01c2fbf358a8897da28dcd299 SHA256 bc616a5bc49d3c42eae57c00eb54ffc67e4f41c5dfb43a8d3e5c338854ab924a
-EBUILD palaver-0.5.ebuild 1409 RMD160 26ea9ff5a1cc3041c3ad58c1dd2c542187afcf3f SHA1 2d043abd518da849a06aff2b1d817ec1dea48ee8 SHA256 4de7276bb835fa7614a01c7fc3cfdad915e61583b984928a09cc239d11328a41
+DIST palaver-0.6.tar.gz 116317 RMD160 8e72b79f6b4f05f5315f13310f2cd97ca928bae6 SHA1 6d0ed3bbf502750053eda808a6a43fcddbf21a42 SHA256 5b6e3893e5fd593c31de442010d6a0d0c6f501f9724b3aa55d147573dfc6f137
+EBUILD palaver-0.5.ebuild 1410 RMD160 fb7a88b69700a2b7bbd11c19ea8a301621f02412 SHA1 a9735adcdc1f765dc8b6d455bec01d2a2c5d5ed6 SHA256 bffd954156ddfc6f655533eb3c8555e98c1240df3dd18a56e4cd85bbea93d9cf
+EBUILD palaver-0.6.ebuild 1410 RMD160 fb7a88b69700a2b7bbd11c19ea8a301621f02412 SHA1 a9735adcdc1f765dc8b6d455bec01d2a2c5d5ed6 SHA256 bffd954156ddfc6f655533eb3c8555e98c1240df3dd18a56e4cd85bbea93d9cf
diff --git a/net-im/palaver/files/palaver-0.5-initd b/net-im/palaver/files/palaver-initd
similarity index 100%
rename from net-im/palaver/files/palaver-0.5-initd
rename to net-im/palaver/files/palaver-initd
diff --git a/net-im/palaver/palaver-0.5.ebuild b/net-im/palaver/palaver-0.5.ebuild
index b8f1138..5c5ae35 100644
--- a/net-im/palaver/palaver-0.5.ebuild
+++ b/net-im/palaver/palaver-0.5.ebuild
@@ -39,7 +39,7 @@ src_install() {
 #		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
 #		/etc/jabber/${PN}.xml
 
-	newinitd "${FILESDIR}/${P}-initd" ${PN}
+	newinitd "${FILESDIR}/${PN}-initd" ${PN}
 #	dosed "s:INSPATH:${inspath}:" /etc/init.d/${PN}
 
 }
diff --git a/net-im/palaver/palaver-0.6.ebuild b/net-im/palaver/palaver-0.6.ebuild
new file mode 100644
index 0000000..5c5ae35
--- /dev/null
+++ b/net-im/palaver/palaver-0.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+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/${PN}/export/16/releases/${P}.tar.gz"
+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"
+}