diff --git a/srcpkgs/mopidy/template b/srcpkgs/mopidy/template
index 9c839039b6da66..cdfea2e10a5414 100644
--- a/srcpkgs/mopidy/template
+++ b/srcpkgs/mopidy/template
@@ -1,21 +1,20 @@
 # Template file for 'mopidy'
 pkgname=mopidy
-version=2.3.1
-revision=2
+version=3.0.1
+revision=1
 archs=noarch
 wrksrc="Mopidy-${version}"
-build_style=python2-module
-pycompile_module=mopidy
-hostmakedepends="python-setuptools python-Sphinx python-sphinx_rtd_theme python-pykka"
+build_style=python3-module
+hostmakedepends="python3-setuptools python3-Sphinx python3-sphinx_rtd_theme python3-pykka"
 depends="gst1-python gst-plugins-good1 gst-plugins-ugly1 gst-plugins-bad1
- python-futures python-tornado python-pykka python-setuptools python-requests"
+ python3-tornado python3-pykka python3-setuptools python3-requests"
 short_desc="Music server for MPD, Spotify, SoundClound and others"
 maintainer="allan <mail@may.mooo.com>"
 license="Apache-2.0"
 homepage="http://www.mopidy.com"
 changelog="https://github.com/mopidy/mopidy/raw/develop/docs/changelog.rst"
 distfiles="${PYPI_SITE}/M/Mopidy/Mopidy-${version}.tar.gz"
-checksum=d1ee47fd91ae7ce2bf99cf85ed9108ac48c3fb5f29b31c7fbe94fac45c6e4a0b
+checksum=7931ca61028e135834df1af22a01029b24f3c2455625f3da84a1a05b5c313ef3
 
 conf_files="/etc/mopidy/*.conf"
 system_accounts="mopidy"
@@ -30,11 +29,12 @@ post_install() {
 	vcopy extra/desktop/mopidy.desktop usr/share/applications/
 	vbin extra/mopidyctl/mopidyctl
 	vman extra/mopidyctl/mopidyctl.8
-	make -C docs man
-	vman docs/_build/man/mopidy.1
-	make -C docs html
+	python3 setup.py build
+	python3 setup.py build_sphinx -b man
+	python3 setup.py build_sphinx -b html
+	vman build/sphinx/man/mopidy.1
 	vmkdir usr/share/doc/mopidy/
-	cp -r docs/_build/html/* ${DESTDIR}/usr/share/doc/mopidy/
+	cp -r build/sphinx/html/* ${DESTDIR}/usr/share/doc/mopidy/
 	vinstall ${FILESDIR}/mopidy.conf 644 etc/mopidy/
 	vinstall ${FILESDIR}/logging.conf 644 etc/mopidy/
 	vsv mopidy
diff --git a/srcpkgs/python-pykka/template b/srcpkgs/python-pykka/template
index 6a3640963659ec..512639c69c36c1 100644
--- a/srcpkgs/python-pykka/template
+++ b/srcpkgs/python-pykka/template
@@ -1,16 +1,24 @@
 # Template file for 'python-pykka'
 pkgname=python-pykka
-version=1.2.1
-revision=2
+version=2.0.2
+revision=1
 archs=noarch
 wrksrc="Pykka-${version}"
-build_style=python2-module
-pycompile_module="pykka"
-hostmakedepends="python-setuptools"
+build_style=python-module
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
-short_desc="Python implementation of the actor model"
+short_desc="Python2 implementation of the actor model"
 maintainer="allan <mail@may.mooo.com>"
-homepage="https://pypi.org/project/Pykka/"
 license="Apache-2.0"
+homepage="https://pypi.org/project/Pykka/"
 distfiles="${PYPI_SITE}/P/Pykka/Pykka-${version}.tar.gz"
-checksum=e847ffeadee49b563426ab803e8eee67264d773e38ca14763fdcda56411e3c11
+checksum=895cc2ed8779b65dd14a90ba3f4b8cb0f7904c7bf0710fe96a923019f8e82a39
+
+python3-pykka_package() {
+	archs=noarch
+	depends="python3"
+	short_desc="${short_desc/Python2/Python3}"
+	pkg_install() {
+		vmove usr/lib/python3*
+	}
+}
diff --git a/srcpkgs/python3-pykka b/srcpkgs/python3-pykka
new file mode 120000
index 00000000000000..06f11ba43a6282
--- /dev/null
+++ b/srcpkgs/python3-pykka
@@ -0,0 +1 @@
+python-pykka
\ No newline at end of file