diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template
index e908c8457e4..b783c1fc083 100644
--- a/srcpkgs/python-Sphinx/template
+++ b/srcpkgs/python-Sphinx/template
@@ -1,17 +1,16 @@
 # Template file for 'python-Sphinx'
 pkgname=python-Sphinx
 version=1.4.8
-revision=1
+revision=2
 noarch=yes
 wrksrc="Sphinx-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
 hostmakedepends="
- python-setuptools python3.4-setuptools python-docutils python3.4-docutils
- python-Jinja2 python3.4-Jinja2 python-Pygments python3.4-Pygments
- python-six python3.4-six python-Babel python3.4-Babel python-alabaster
- python3.4-alabaster python-snowballstemmer python3.4-snowballstemmer
- python-imagesize python3.4-imagesize"
+ python-setuptools python3-setuptools python-docutils python3-docutils
+ python-Jinja2 python3-Jinja2 python-Pygments python3-Pygments
+ python-six python3-six python-Babel python3-Babel python-alabaster
+ python3-alabaster python-snowballstemmer python3-snowballstemmer
+ python-imagesize python3-imagesize"
 makedepends="${hostmakedepends}"
 depends="
  python-setuptools python-docutils python-Jinja2 python-Pygments python-six
@@ -25,32 +24,38 @@ distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
 checksum=41af978f653ef862eb4bb3776dabd8ff13afed17e431907310fe990a3947707f
 
 alternatives="
- sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2.7
- sphinx:sphinx-autogen:/usr/bin/sphinx-autogen2.7
- sphinx:sphinx-build:/usr/bin/sphinx-build2.7
- sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart2.7"
+ sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc2
+ sphinx:sphinx-autogen:/usr/bin/sphinx-autogen2
+ sphinx:sphinx-build:/usr/bin/sphinx-build2
+ sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart2"
 
 post_install() {
 	vlicense LICENSE
 }
 
-python3.4-Sphinx_package() {
+python3-Sphinx_package() {
 	alternatives="
-	 sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc3.4
-	 sphinx:sphinx-autogen:/usr/bin/sphinx-autogen3.4
-	 sphinx:sphinx-build:/usr/bin/sphinx-build3.4
-	 sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart3.4"
+	 sphinx:sphinx-apidoc:/usr/bin/sphinx-apidoc3
+	 sphinx:sphinx-autogen:/usr/bin/sphinx-autogen3
+	 sphinx:sphinx-build:/usr/bin/sphinx-build3
+	 sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart3"
 	noarch=yes
 	depends="
-	 python3.4-setuptools python3.4-docutils python3.4-Jinja2 python3.4-Pygments
-	 python3.4-six python3.4-Babel python3.4-alabaster python3.4-snowballstemmer
-	 python3.4-imagesize"
-	pycompile_version="3.4"
+	 python3-setuptools python3-docutils python3-Jinja2 python3-Pygments
+	 python3-six python3-Babel python3-alabaster python3-snowballstemmer
+	 python3-imagesize"
 	pycompile_module="sphinx"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-Sphinx>=0"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/sphinx-*3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/sphinx-*3
+		vmove usr/lib/python3*
 		vlicense LICENSE
 	}
 }
+python3.4-Sphinx_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-Sphinx>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-Sphinx b/srcpkgs/python3-Sphinx
new file mode 120000
index 00000000000..2ebd263145b
--- /dev/null
+++ b/srcpkgs/python3-Sphinx
@@ -0,0 +1 @@
+python-Sphinx
\ No newline at end of file