diff --git a/srcpkgs/python-Sphinx/template b/srcpkgs/python-Sphinx/template
index 9676f6bb13..c100a43e02 100644
--- a/srcpkgs/python-Sphinx/template
+++ b/srcpkgs/python-Sphinx/template
@@ -1,63 +1,61 @@
 # Template file for 'python-Sphinx'
 pkgname=python-Sphinx
-version=1.2.3
-revision=2
+version=1.3.1
+revision=1
 noarch=yes
 wrksrc="Sphinx-${version}"
 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-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-sphinx-rtd-theme python3.4-sphinx-rtd-theme
+ python-snowballstemmer python3.4-snowballstemmer"
 makedepends="${hostmakedepends}"
-depends="python-setuptools python-docutils python-Jinja2 python-Pygments"
+depends="
+ python-setuptools python-docutils python-Jinja2 python-Pygments python-six
+ python-Babel python-alabaster python-sphinx-rtd-theme python-snowballstemmer"
 pycompile_module="sphinx"
 short_desc="Python2 documentation generator"
 maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://sphinx-doc.org/"
 license="BSD"
-distfiles="https://pypi.python.org/packages/source/S/Sphinx/Sphinx-${version}.tar.gz"
-checksum=94933b64e2fe0807da0612c574a021c0dac28c7bd3c4a23723ae5a39ea8f3d04
-
-post_extract() {
-	cp -a ${wrksrc} /tmp/python2.7-build
-	cp -a ${wrksrc} /tmp/python3.4-build
-	mv /tmp/python{2.7,3.4}-build ${wrksrc}
-}
+distfiles="${PYPI_SITE}/S/Sphinx/Sphinx-${version}.tar.gz"
+checksum=1a6e5130c2b42d2de301693c299f78cc4bd3501e78b610c08e45efc70e2b5114
 
 pre_build() {
-	cd ${wrksrc}/python3.4-build
+	cp -a ${wrksrc} /tmp/sphinx-2.7
+	cp -a ${wrksrc} /tmp/sphinx-3.4
+	mv /tmp/sphinx-{2.7,3.4} ${wrksrc}
+
+	cd sphinx-3.4
 	sed -i 's|\(sphinx-.*\) =|\13 =|' setup.py
 	sed -ri "s,'(sphinx-(:?|all|apidoc|build|quickstart))','\13'," doc/conf.py
 	sed -i 's,#! /usr/bin/env python,&3.4,' sphinx/pycode/pgen2/token.py
 }
-
 do_build() {
-	cd ${wrksrc}/python2.7-build
-	python setup.py build
-	python sphinx-build.py -b man doc build/man
-
-	cd ${wrksrc}/python3.4-build
-	python3.4 setup.py build
-	python sphinx-build.py -b man doc build/man
+	for pyver in $python_versions; do
+		cd ${wrksrc}/sphinx-${pyver}
+		python${pyver} setup.py build
+		python${pyver} sphinx-build.py -b man doc build/man
+	done
 }
-
 do_install() {
-	cd ${wrksrc}/python2.7-build
-	python setup.py install --root=${DESTDIR}
-
-	cd ${wrksrc}/python3.4-build
-	python3.4 setup.py install --root=${DESTDIR}
-}
-
-post_install() {
 	vmkdir usr/share/man/man1
-	vcopy ${wrksrc}/python2.7-build/build/man/*.1 usr/share/man/man1
-	vcopy ${wrksrc}/python3.4-build/build/man/*.1 usr/share/man/man1
+	for pyver in $python_versions; do
+		cd ${wrksrc}/sphinx-${pyver}
+		python${pyver} setup.py install --root=${DESTDIR}
+		vcopy ${wrksrc}/sphinx-${pyver}/build/man/*.1 usr/share/man/man1
+	done
+	vlicense LICENSE
 }
 
 python3.4-Sphinx_package() {
 	noarch=yes
-	depends="python3.4-setuptools python3.4-docutils python3.4-Jinja2 python3.4-Pygments"
+	depends="
+	 python3.4-setuptools python3.4-docutils python3.4-Jinja2 python3.4-Pygments
+	 python3.4-six python3.4-Babel python3.4-alabaster python3.4-sphinx-rtd-theme
+	 python3.4-snowballstemmer"
 	pycompile_version="3.4"
 	pycompile_module="sphinx"
 	short_desc="${short_desc/Python2/Python3.4}"
@@ -65,5 +63,6 @@ python3.4-Sphinx_package() {
 		vmove usr/bin/sphinx-*3
 		vmove usr/lib/python3.4
 		vmove usr/share/man/man1/sphinx-*3.1
+		vlicense LICENSE
 	}
 }