diff --git a/net-im/palaver/Manifest b/net-im/palaver/Manifest
index cec2171..b231247 100644
--- a/net-im/palaver/Manifest
+++ b/net-im/palaver/Manifest
@@ -1,3 +1,5 @@
 AUX palaver-initd 589 RMD160 e182621c739f9ca57d36d3f96954dd62cfa24b53 SHA1 32adbe8d2225f3c851995939a8ff40971ca831e7 SHA256 eaffafe3dd9683b3d34b75b65931140ce9fe75c0650bee9170ae4815d659eb75
+DIST master 137185 RMD160 28ceb8a30d861e339fd397d8e652f41d967e2e86 SHA1 b005d6c13418c77845b08bf50c30b401729827c7 SHA256 db0a6b432c4570b37e58bba6ce466547c39f8380073b6917f7bca74b71e0db4a
 DIST palaver-0.6.tar.bz2 71431 RMD160 d1eac261b4ea9263d6992d17d5498f27b054643b SHA1 6e33a77322a432f5c20e6b05dea93ee10d6e4d5d SHA256 437a32250f7ba2a7b07e1dae894893ae4bf32e8a7d8d8e97a4803c9fee4dde26
 EBUILD palaver-0.6-r3.ebuild 1428 RMD160 43c5bae7622184f957d39f06d5ddc8949525a141 SHA1 2e5208f49fba67b42a04cb857f1e8e63627ac6f5 SHA256 177b114e9b224b220c925a2d25db72a6903fc288e884f757dea8648795b1b09d
+EBUILD palaver-0.6-r4.ebuild 1507 RMD160 a29af09f69690c9668a60f6f50404ac26656a0d6 SHA1 d7af781677fe0443e6ffba6fb74b2de23935cc6d SHA256 0960c6ce606acbfdcac8f1a089a5fef357e9c8acc67117cd07ffe72b3f66a3dd
diff --git a/net-im/palaver/palaver-0.6-r4.ebuild b/net-im/palaver/palaver-0.6-r4.ebuild
new file mode 100644
index 0000000..17b6ce3
--- /dev/null
+++ b/net-im/palaver/palaver-0.6-r4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+PYTHON_DEPEND="2"
+
+inherit eutils python
+DESCRIPTION="Multi-user chat component for jabber implemented in python"
+HOMEPAGE="https://github.com/twonds/palaver"
+MY_PN="master"
+SRC_URI="https://github.com/twonds/palaver/zipball/${MY_PN}"
+#SRC_URI="http://code.stanziq.com/cgit/${PN}/${PN}/snapshot/${P}.tar.bz2"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~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"
+}