diff --git a/net-im/punjab/Manifest b/net-im/punjab/Manifest
index a068951..cda48dc 100644
--- a/net-im/punjab/Manifest
+++ b/net-im/punjab/Manifest
@@ -1,4 +1,6 @@
 AUX punjab-confd 67 SHA256 2951827630ccbd793922d32f7f61416747c50ebb2cd542062f1dd82dc9ec94c7 SHA512 9784f2b70cc5830b44702ad74d5b18475fb081f5728ac346746b3f347a9a33771680752a29e42e13b9d2ce7eb983babe22486945b2be22dbfbff6078e8a837ba WHIRLPOOL cb64ecbcd7710d0a6f33ece9bb851a829a6e8c1a978235f7e96f882d69b63ab172a69e4c04c38adc07758fcf39fa0ebebf8f3a40821d7295746378d91d3f98dc
 AUX punjab-initd 621 SHA256 4263b2f8a2abad5317d1555005ec7038478494fa450918e80f065a488ac80e04 SHA512 7e280ca57a8f091e96cc3ff62b9c74fefe858ca2c94ca0c981dfadd0a26c17d4989164acc8a8c1f6bfd734921b7a7307e89b54024c0ea62c32f0cd4bf8ce703a WHIRLPOOL abe9da6820c028a3d474f4c30d990edb5489cc2c261acac6a03fb8a2e450b872e471f91fefd23630f9c707abf91a66558b959df8ab4716a1e31e5adb42748851
-EBUILD punjab-9999.ebuild 1199 SHA256 079c0885341f550f4efe224e6ad4b079960c52a231cd72afb302847778cd9b70 SHA512 3d418807d12e0f1550f4043ce05b8fa050aa1b02aabcd570030a0a221b906606d23deeb98261ef17ef8c6d5938ee5db0444e0972d066bfa1ab0d8b28a7bf1cff WHIRLPOOL a438483cfa55ad32c78da1556d5567c28692f5f0653630c29d123409d287979b1152abbb5073817c18bb85331b2dfb210ded344b878a549d9607c16625a6db9e
+DIST punjab-0.15.tar.gz 44056 SHA256 96fd69d77477f967f25c0d6a0af5a628d522e6df11dbb6a16e84bf357db18e76 SHA512 7651cade4e8caea700dd8cccff6459b0b3593003466056c961e95261f33d533e767ff923d81685170b8c6ce1623147723b98c25210a427a016df8cb9fec09dfd WHIRLPOOL 1497a41540715c41e5407200c29c2067222526e1d0148bfd355930bc5f5f89f7080c2d67d8f63558542f770401d058f6b08062e4fc032a5bbe5e5dc5a4ea0121
+EBUILD punjab-0.15.ebuild 1292 SHA256 f3cd3e531653646de74af92118e59fa1843b5055472d235d892a7ede547483ca SHA512 be11fc45d928d397ba2eb623f72bd8321a33f192a54e40d2362aa67b3b084a2e0befb4c112685104508ed1f5490472b2ee720302a544933f3aa50539c8fc9ad8 WHIRLPOOL c400afc63e5439536679ca40c2172e856e959720c1cc64f9f053aa25fb4b0451f6106509653db67f3a92496df64580d342316c05cf4651e24edaf570acdd6b0c
+EBUILD punjab-9999.ebuild 1265 SHA256 d96d221fcb3c7f99ea75e7045a25848867424dba100966bc1ae166c792a63248 SHA512 8afa97fce87caa5da14fe232c38615b2fcafa7f21dfa1521ee1d12e20e83e51768d3617c6efcc2449d4828ab19bea3333bd659d10d9e122553f70ab27a0022c8 WHIRLPOOL 9aaa63e728e014dabd47c09170bff131f6524446ed8a1329a1f3dda53f0489bcd9b2fef51c0099be56064f05d0815185932281c87a701155d1d22fe870843e44
 MISC metadata.xml 307 SHA256 c5de1524b4a2f44a68113ee604c2e4917a13f6d3689fe4b3a5b54f0037a083de SHA512 22f5442878e7b227d7ba0cb7393865818474086e26ed8e835903f64af8b9c72c524640a8c4ced599a7181e4f3b4195ce84d026729ad22908832b5a9f31697e4e WHIRLPOOL c759749f423ad411f0f2d2f3fa82b395369c58a6da3aa8efc90831a9238758c4f70d2003cd81512fbbe797b02817cc26ebae76eb917610354ec6f197f139dd17
diff --git a/net-im/punjab/punjab-0.15.ebuild b/net-im/punjab/punjab-0.15.ebuild
new file mode 100644
index 0000000..20d21e3
--- /dev/null
+++ b/net-im/punjab/punjab-0.15.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils python-r1
+DESCRIPTION="BOSH connection manager for jabber implemented in python"
+HOMEPAGE="https://github.com/twonds/punjab"
+SRC_URI="https://github.com/twonds/punjab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tls"
+DEPEND="${PYTHON_DEPS}
+	net-im/jabber-base"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/twisted-core-11.1.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-names-11.1.0[${PYTHON_USEDEP}]
+	tls? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	${DEPEND}"
+
+pkg_setup() {
+	python-r1_pkg_setup
+}
+
+src_compile() {
+	# nothing to be done here?
+	distutils-r1_src_compile
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /etc/jabber
+	newins punjab.tac ${PN}.tac
+	fperms 600 /etc/jabber/${PN}.tac
+	fowners jabber:jabber /etc/jabber/${PN}.tac
+#	dosed \
+#		"s:<spool>[^\<]*</spool>:<spool>/var/spool/jabber</spool>:" \
+#		/etc/jabber/${PN}.xml
+
+	newinitd "${FILESDIR}/${PN}-initd" ${PN}
+#	newconfd "${FILESDIR}/${PN}-confd" ${PN}
+
+}
+
+pkg_postinst() {
+	einfo "A sample config file has been installed into /etc/jabber/${PN}.tac."
+	einfo "Please adjust the settings as needed."
+}
diff --git a/net-im/punjab/punjab-9999.ebuild b/net-im/punjab/punjab-9999.ebuild
index 6d8bee1..5b32ebc 100644
--- a/net-im/punjab/punjab-9999.ebuild
+++ b/net-im/punjab/punjab-9999.ebuild
@@ -3,7 +3,6 @@
 # $Id$
 
 EAPI=5
-PYTHON_DEPEND="2"
 PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1 eutils python-r1 git-2
@@ -14,23 +13,25 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="tls"
-DEPEND="net-im/jabber-base"
-RDEPEND=">=dev-python/twisted-core-11.1.0
-	>=dev-python/twisted-names-11.1.0
-	tls? ( dev-python/pyopenssl )
+DEPEND="${PYTHON_DEPS}
+	net-im/jabber-base"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/twisted-core-11.1.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-names-11.1.0[${PYTHON_USEDEP}]
+	tls? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
 	${DEPEND}"
 
 pkg_setup() {
-	python_set_active_version 2
+	python-r1_pkg_setup
 }
 
 src_compile() {
 	# nothing to be done here?
-	distutils_src_compile
+	distutils-r1_src_compile
 }
 
 src_install() {
-	distutils_src_install
+	distutils-r1_src_install
 
 	insinto /etc/jabber
 	newins punjab.tac ${PN}.tac