diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index f6703564de4..60111bcc92d 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,27 +1,41 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
-version=2.2.1
-revision=2
+version=2.4.1
+revision=1
 wrksrc="Markdown-${version}"
 build_style=python-module
-hostmakedepends="python-distribute python3-distribute"
-makedepends="python-devel python3-devel"
-noarch="yes"
-python_versions="2.7 3.3"
-pycompile_module="markdown"
+hostmakedepends="python-setuptools python3.4-setuptools"
+makedepends="python-devel python3.4-devel"
 depends="python>=2.7"
+noarch="yes"
+python_versions="2.7 3.4"
+pycompile_module="markdown"
 short_desc="Python2 implementation of John Gruber's Markdown"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://pypi.python.org/pypi/Markdown"
 license="BSD"
 distfiles="http://pypi.python.org/packages/source/M/Markdown/Markdown-${version}.tar.gz"
-checksum=f8b9a1efceab71afe9336a7c456fde36bfb0f505fb664ebb7f3dd44eddab44b6
+checksum=812ec5249f45edc31330b7fb06e52aaf6ab2d83aa27047df7cb6837ef2d269b6
 
-python3-Markdown_package() {
-	noarch=yes
-	depends="python3"
-	short_desc="${short_desc//Python2/Python3}"
+pre_install() {
+	mv build-3.4/scripts-3.4/markdown_py{,3}
+}
+
+post_install() {
+	rm -f ${DESTDIR}/usr/bin/markdown_py
+	vinstall build-2.7/scripts-2.7/markdown_py 755 usr/bin
+	vinstall LICENSE.md 644 usr/share/licenses/${pkgname} LICENSE
+}
+
+python3.4-Markdown_package() {
+	noarch="yes"
+	depends="python3.4"
+	pycompile_version="3.4"
+	pycompile_module="markdown"
+	short_desc="${short_desc//Python2/Python3.4}"
 	pkg_install() {
-		vmove /usr/lib/python3.3
+		vmove /usr/bin/markdown_py3
+		vmove /usr/lib/python3.4
+		vinstall ${wrksrc}/LICENSE.md 644 usr/share/licenses/${pkgname} LICENSE
 	}
 }
diff --git a/srcpkgs/python3-Markdown b/srcpkgs/python3.4-Markdown
similarity index 100%
rename from srcpkgs/python3-Markdown
rename to srcpkgs/python3.4-Markdown