diff --git a/srcpkgs/python-pystache/template b/srcpkgs/python-pystache/template
index f73c33eb717..efcf96aa409 100644
--- a/srcpkgs/python-pystache/template
+++ b/srcpkgs/python-pystache/template
@@ -1,27 +1,38 @@
 # Template file for 'python-pystache'
 pkgname=python-pystache
 version=0.5.4
-revision=1
+revision=2
 noarch=yes
 wrksrc="pystache-${version}"
 build_style=python-module
 pycompile_module="pystache"
 hostmakedepends="python-setuptools python3-setuptools"
-short_desc="Mustache template engine written in python"
+depends="python-setuptools"
+short_desc="Python2 implementation of Mustache"
 maintainer="John <johnz@posteo.net>"
 license="MIT"
-homepage="http://defunkt.io/pystache/"
+homepage="https://github.com/defunkt/pystache"
 distfiles="${PYPI_SITE}/p/pystache/pystache-${version}.tar.gz"
 checksum=f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a
+alternatives="pystache:pystache:/usr/bin/pystache2"
 
+pre_build() {
+	# no pystache-test entry point
+	sed -i '/pystache-test/d' setup.py
+}
 post_install() {
 	vlicense LICENSE
 }
 
 python3-pystache_package() {
+	noarch=yes
 	pycompile_module="pystache"
+	depends="python3-setuptools"
+	short_desc="${short_desc/Python2/Python3}"
+	alternatives="pystache:pystache:/usr/bin/pystache2"
 	pkg_install() {
 		vmove "usr/lib/python3*"
 		vmove "usr/bin/*3"
+		vlicense LICENSE
 	}
 }