diff --git a/srcpkgs/python-docutils/template b/srcpkgs/python-docutils/template
index d47d0822b4..17776890fa 100644
--- a/srcpkgs/python-docutils/template
+++ b/srcpkgs/python-docutils/template
@@ -1,16 +1,49 @@
 # Template file for 'python-docutils'
 pkgname=python-docutils
-version=0.10
+version=0.11
+revision=1
 wrksrc="docutils-${version}"
-revision=2
 build_style=python-module
-makedepends="python"
-depends="${makedepends}"
+makedepends="python python3"
+depends="python>=2.7"
 noarch="yes"
+python_versions="2.7 3.3"
 pycompile_module="docutils"
-short_desc="Text processing system to convert to various formats"
-maintainer="Juan RP <xtraeme@gmail.com>"
+short_desc="Text processing system to convert to various formats (Python2)"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://docutils.sourceforge.net"
-license="GPL-3"
+license="BSD-2-Clause, GPL-3, PSF, Public Domain"
 distfiles="${SOURCEFORGE_SITE}/docutils/docutils-${version}.tar.gz"
-checksum=370624e61b6773da2f2fb17cc2a4eaea4bb596c3585d13f75ff193c1c738603e
+checksum=9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9
+
+pre_install() {
+	# fix name conflict and remove .py suffix
+	for file in 2html 2latex 2man 2odt 2odt_prepstyles 2pseudoxml 2s5 2xetex 2xml pep2html; do
+		mv build-2.7/scripts-2.7/rst${file}{.py,}
+		mv build-3.3/scripts-3.3/rst${file}{.py,3}
+	done
+}
+
+post_install() {
+	# remove old files
+	for file in 2html 2latex 2man 2odt 2odt_prepstyles 2pseudoxml 2s5 2xetex 2xml pep2html; do
+		rm -f ${DESTDIR}/usr/bin/rst${file}.py
+	done
+
+	# install licenses
+	vinstall licenses/BSD-2-Clause.txt 644 usr/share/licenses/${pkgname}
+	vinstall licenses/python-2-1-1.txt 644 usr/share/licenses/${pkgname}
+}
+
+python3-docutils_package() {
+	noarch="yes"
+	depends="python3"
+	short_desc="${short_desc//Python2/Python3}"
+	pkg_install() {
+		vmove /usr/bin/*3
+		vmove /usr/lib/python3.3
+		# install licenses
+		vinstall ${wrksrc}/licenses/BSD-2-Clause.txt 644 usr/share/licenses/${pkgname}
+		vinstall ${wrksrc}/licenses/python-2-1-1.txt 644 usr/share/licenses/${pkgname}
+	}
+}
diff --git a/srcpkgs/python3-docutils b/srcpkgs/python3-docutils
new file mode 120000
index 0000000000..8876054b3b
--- /dev/null
+++ b/srcpkgs/python3-docutils
@@ -0,0 +1 @@
+python-docutils
\ No newline at end of file