diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index 7dd7a0228a2..05a5e8cf1a5 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -1,12 +1,11 @@
 # Template file for 'python-docutils'
 pkgname=python-docutils
 version=0.12
-revision=3
+revision=4
 noarch=yes
 wrksrc="docutils-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
-hostmakedepends="python-setuptools python3.4-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python"
 pycompile_module="docutils"
 short_desc="Python2 documentation utilities"
@@ -17,41 +16,47 @@ distfiles="${PYPI_SITE}/d/docutils/docutils-${version}.tar.gz"
 checksum=c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa
 
 alternatives="
- docutils:rst2html:/usr/bin/rst2html.py2.7
- docutils:rst2latex:/usr/bin/rst2latex.py2.7
- docutils:rst2man:/usr/bin/rst2man.py2.7
- docutils:rst2odt:/usr/bin/rst2odt.py2.7
- docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2.7
- docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2.7
- docutils:rst2s5:/usr/bin/rst2s5.py2.7
- docutils:rst2xetex:/usr/bin/rst2xetex.py2.7
- docutils:rst2xml:/usr/bin/rst2xml.py2.7
- docutils:rstpep2html:/usr/bin/rstpep2html.py2.7"
+ docutils:rst2html:/usr/bin/rst2html.py2
+ docutils:rst2latex:/usr/bin/rst2latex.py2
+ docutils:rst2man:/usr/bin/rst2man.py2
+ docutils:rst2odt:/usr/bin/rst2odt.py2
+ docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py2
+ docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py2
+ docutils:rst2s5:/usr/bin/rst2s5.py2
+ docutils:rst2xetex:/usr/bin/rst2xetex.py2
+ docutils:rst2xml:/usr/bin/rst2xml.py2
+ docutils:rstpep2html:/usr/bin/rstpep2html.py2"
 
 post_install() {
 	vlicense COPYING.txt COPYING
 }
 
-python3.4-docutils_package() {
+python3-docutils_package() {
 	alternatives="
-	 docutils:rst2html:/usr/bin/rst2html.py3.4
-	 docutils:rst2latex:/usr/bin/rst2latex.py3.4
-	 docutils:rst2man:/usr/bin/rst2man.py3.4
-	 docutils:rst2odt:/usr/bin/rst2odt.py3.4
-	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3.4
-	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3.4
-	 docutils:rst2s5:/usr/bin/rst2s5.py3.4
-	 docutils:rst2xetex:/usr/bin/rst2xetex.py3.4
-	 docutils:rst2xml:/usr/bin/rst2xml.py3.4
-	 docutils:rstpep2html:/usr/bin/rstpep2html.py3.4"
+	 docutils:rst2html:/usr/bin/rst2html.py3
+	 docutils:rst2latex:/usr/bin/rst2latex.py3
+	 docutils:rst2man:/usr/bin/rst2man.py3
+	 docutils:rst2odt:/usr/bin/rst2odt.py3
+	 docutils:rst2odt_prepstyles:/usr/bin/rst2odt_prepstyles.py3
+	 docutils:rst2pseudoxml:/usr/bin/rst2pseudoxml.py3
+	 docutils:rst2s5:/usr/bin/rst2s5.py3
+	 docutils:rst2xetex:/usr/bin/rst2xetex.py3
+	 docutils:rst2xml:/usr/bin/rst2xml.py3
+	 docutils:rstpep2html:/usr/bin/rstpep2html.py3"
 	noarch=yes
-	depends="python3.4"
-	pycompile_version="3.4"
+	depends="python3"
 	pycompile_module="docutils"
-	short_desc="${short_desc/Python2/Python3.4}"
+	replaces="python3.4-docutils>=0"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
-		vmove usr/bin/*3.4
-		vmove usr/lib/python3.4
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
 		vlicense COPYING.txt COPYING
 	}
 }
+python3.4-docutils_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-docutils>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 00000000000..8876054b3b5
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file