diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template
index 42969925f9..ec04e91c9a 100644
--- a/srcpkgs/python-Sphinx/template
+++ b/srcpkgs/python-Sphinx/template
@@ -4,13 +4,13 @@ version=1.8.5
 revision=2
 archs=noarch
 wrksrc="Sphinx-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="sphinx"
-hostmakedepends="python-setuptools python3-setuptools"
+hostmakedepends="python-setuptools"
 depends="python-setuptools python-docutils python-Jinja2 python-Pygments
  python-six python-Babel python-alabaster python-snowballstemmer python-imagesize
  python-requests python-packaging python-sphinxcontrib-websupport python-typing"
-short_desc="Python2 documentation generator"
+short_desc="Python 2 documentation generator"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 license="BSD-2-Clause"
 homepage="http://sphinx-doc.org/"
@@ -24,25 +24,9 @@ alternatives="
  sphinx:sphinx-quickstart:/usr/bin/sphinx-quickstart2"
 
 post_install() {
+	mv ${DESTDIR}/usr/bin/sphinx-apidoc ${DESTDIR}/usr/bin/sphinx-apidoc2
+	mv ${DESTDIR}/usr/bin/sphinx-autogen ${DESTDIR}/usr/bin/sphinx-autogen2
+	mv ${DESTDIR}/usr/bin/sphinx-build ${DESTDIR}/usr/bin/sphinx-build2
+	mv ${DESTDIR}/usr/bin/sphinx-quickstart ${DESTDIR}/usr/bin/sphinx-quickstart2
 	vlicense LICENSE
 }
-
-python3-Sphinx_package() {
-	alternatives="
-	 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"
-	archs=noarch
-	depends="python3-setuptools python3-docutils python3-Jinja2 python3-Pygments
-	 python3-six python3-Babel python3-alabaster python3-snowballstemmer
-	 python3-imagesize python3-requests python3-packaging
-	 python3-sphinxcontrib-websupport"
-	pycompile_module="sphinx"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		vmove usr/bin/sphinx-*3
-		vmove usr/lib/python3*
-		vlicense LICENSE
-	}
-}
diff --git a/srcpkgs/python-Sphinx/update b/srcpkgs/python-Sphinx/update
index e957dc4305..88d1175119 100644
--- a/srcpkgs/python-Sphinx/update
+++ b/srcpkgs/python-Sphinx/update
@@ -1 +1 @@
-ignore="*a* *b*"
+ignore="2*"
diff --git a/srcpkgs/python3-Sphinx b/srcpkgs/python3-Sphinx
deleted file mode 120000
index 2ebd263145..0000000000
--- a/srcpkgs/python3-Sphinx
+++ /dev/null
@@ -1 +0,0 @@
-python-Sphinx
\ No newline at end of file
diff --git a/srcpkgs/python3-Sphinx/template b/srcpkgs/python3-Sphinx/template
new file mode 100644
index 0000000000..104cffb3f5
--- /dev/null
+++ b/srcpkgs/python3-Sphinx/template
@@ -0,0 +1,34 @@
+# Template file for 'python3-Sphinx'
+pkgname=python3-Sphinx
+version=2.3.1
+revision=1
+archs=noarch
+wrksrc=Sphinx-${version}
+build_style=python3-module
+pycompile_module=sphinx
+hostmakedepends="python3-setuptools"
+depends="python3-Jinja2 python3-docutils python3-Pygments
+ python3-snowballstemmer python3-Babel python3-alabaster python3-imagesize
+ python3-requests python3-packaging python3-sphinxcontrib-applehelp
+ python3-sphinxcontrib-devhelp python3-sphinxcontrib-htmlhelp
+ python3-sphinxcontrib-jsmath python3-sphinxcontrib-qthelp
+ python3-sphinxcontrib-serializinghtml"
+short_desc="Python 3 documentation generator"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="BSD-3-Clause"
+homepage="http://sphinx-doc.org"
+distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
+checksum=e6e766b74f85f37a5f3e0773a1e1be8db3fcb799deb58ca6d18b70b0b44542a5
+alternatives="
+ 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"
+
+post_install() {
+	mv ${DESTDIR}/usr/bin/sphinx-apidoc ${DESTDIR}/usr/bin/sphinx-apidoc3
+	mv ${DESTDIR}/usr/bin/sphinx-autogen ${DESTDIR}/usr/bin/sphinx-autogen3
+	mv ${DESTDIR}/usr/bin/sphinx-build ${DESTDIR}/usr/bin/sphinx-build3
+	mv ${DESTDIR}/usr/bin/sphinx-quickstart ${DESTDIR}/usr/bin/sphinx-quickstart3
+	vlicense LICENSE
+}