diff --git a/srcpkgs/python-pystache/template b/srcpkgs/python-pystache/template
deleted file mode 100644
index 6c85b2d20d3..00000000000
--- a/srcpkgs/python-pystache/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'python-pystache'
-pkgname=python-pystache
-version=0.5.4
-revision=6
-wrksrc="pystache-${version}"
-build_style=python-module
-pycompile_module="pystache"
-hostmakedepends="python-setuptools python3-setuptools"
-depends="python-setuptools"
-short_desc="Python2 implementation of Mustache"
-maintainer="John <me@johnnynator.dev>"
-license="MIT"
-homepage="https://github.com/defunkt/pystache"
-distfiles="${PYPI_SITE}/p/pystache/pystache-${version}.tar.gz"
-checksum=f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a
-alternatives="pystache:pystache:/usr/bin/pystache2"
-
-do_build() {
-	# This is pure python, no need for cross antics
-	python2.7 setup.py build --build-base=build-2.7
-
-	# Convert py2 syntax to py3 since setuptools no longer does it
-	2to3-${py3_ver} -w pystache
-	python3 setup.py build --build-base=build-${py3_ver}
-}
-
-post_install() {
-	vlicense LICENSE
-}
-
-python3-pystache_package() {
-	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
-	}
-}
diff --git a/srcpkgs/python3-pystache b/srcpkgs/python3-pystache
deleted file mode 120000
index 7663aaa10e8..00000000000
--- a/srcpkgs/python3-pystache
+++ /dev/null
@@ -1 +0,0 @@
-python-pystache
\ No newline at end of file
diff --git a/srcpkgs/python-pystache/patches/setup.patch b/srcpkgs/python3-pystache/patches/setup.patch
similarity index 100%
rename from srcpkgs/python-pystache/patches/setup.patch
rename to srcpkgs/python3-pystache/patches/setup.patch
diff --git a/srcpkgs/python3-pystache/template b/srcpkgs/python3-pystache/template
new file mode 100644
index 00000000000..f603b38cf2c
--- /dev/null
+++ b/srcpkgs/python3-pystache/template
@@ -0,0 +1,25 @@
+# Template file for 'python3-pystache'
+pkgname=python3-pystache
+version=0.5.4
+revision=6
+wrksrc="pystache-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools"
+short_desc="Python3 implementation of Mustache"
+maintainer="John <me@johnnynator.dev>"
+license="MIT"
+homepage="https://github.com/defunkt/pystache"
+distfiles="${PYPI_SITE}/p/pystache/pystache-${version}.tar.gz"
+checksum=f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a
+
+do_build() {
+	# Convert py2 syntax to py3 since setuptools no longer does it
+	2to3-${py3_ver} -w pystache
+	python3 setup.py build --build-base=build-${py3_ver}
+}
+
+post_install() {
+	vlicense LICENSE
+	ln -s pystache "${DESTDIR}/usr/bin/pystache3"
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index a912a733ef9..020ca1661a0 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -289,6 +289,7 @@ replaces="
  python-pydns<=2.3.6_4
  python-pyenet<=1.3.13.post7_2
  python-pyside<=1.2.2_7
+ python-pystache<=0.5.4_6
  python-pytest-relaxed<=1.1.2_2
  python-pytz<=2021.3_2
  python-reportlab<=3.5.42_3