diff --git a/srcpkgs/python-Pygments/template b/srcpkgs/python-Pygments/template
index a372efe6ceb..8bc0360ed03 100644
--- a/srcpkgs/python-Pygments/template
+++ b/srcpkgs/python-Pygments/template
@@ -1,14 +1,14 @@
 # Template file for 'python-Pygments'
 pkgname=python-Pygments
 version=1.6
-revision=3
+revision=4
+noarch=yes
 wrksrc="Pygments-${version}"
+python_versions="2.7 3.4"
 build_style=python-module
 hostmakedepends="python-setuptools python3.4-setuptools"
 makedepends="python-devel python3.4-devel"
-depends="python>=2.7"
-python_versions="2.7 3.4"
-noarch="yes"
+depends="python"
 pycompile_module="pygments"
 short_desc="Python2 syntax highlighter"
 maintainer="Juan RP <xtraeme@gmail.com>"
@@ -17,6 +17,33 @@ license="BSD"
 distfiles="http://pypi.python.org/packages/source/P/Pygments/Pygments-${version}.tar.gz"
 checksum=799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0
 
+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}
+}
+
+pre_build() {
+	cd ${wrksrc}/python3.4-build
+	sed -i 's,pygmentize ,pygmentize3 ,' setup.py
+}
+
+do_build() {
+	cd ${wrksrc}/python2.7-build
+	python setup.py build
+
+	cd ${wrksrc}/python3.4-build
+	python3.4 setup.py build
+}
+
+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}
+}
+
 python3.4-Pygments_package() {
 	noarch="yes"
 	depends="python3.4"
@@ -24,6 +51,7 @@ python3.4-Pygments_package() {
 	pycompile_module="pygments"
 	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove /usr/lib/python3.4
+		vmove usr/bin/pygmentize3
+		vmove usr/lib/python3.4
 	}
 }