diff --git a/srcpkgs/python-Markdown/template b/srcpkgs/python-Markdown/template
index 60111bcc92d..02ec389e242 100644
--- a/srcpkgs/python-Markdown/template
+++ b/srcpkgs/python-Markdown/template
@@ -1,21 +1,21 @@
 # Template file for 'python-Markdown'
 pkgname=python-Markdown
-version=2.4.1
+version=2.5
 revision=1
+noarch=yes
 wrksrc="Markdown-${version}"
 build_style=python-module
-hostmakedepends="python-setuptools python3.4-setuptools"
-makedepends="python-devel python3.4-devel"
-depends="python>=2.7"
-noarch="yes"
 python_versions="2.7 3.4"
+hostmakedepends="python-devel python3.4-devel"
+makedepends="${hostmakedepends}"
+depends="python"
 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=812ec5249f45edc31330b7fb06e52aaf6ab2d83aa27047df7cb6837ef2d269b6
+distfiles="${PYPI_SITE}/M/Markdown/Markdown-${version}.tar.gz"
+checksum=6ba74a1e7141c9603750d80711b639a7577bffb785708e6260090239ee5bc76d
 
 pre_install() {
 	mv build-3.4/scripts-3.4/markdown_py{,3}
@@ -24,18 +24,18 @@ pre_install() {
 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
+	vlicense LICENSE.md LICENSE
 }
 
 python3.4-Markdown_package() {
-	noarch="yes"
+	noarch=yes
 	depends="python3.4"
 	pycompile_version="3.4"
 	pycompile_module="markdown"
-	short_desc="${short_desc//Python2/Python3.4}"
+	short_desc="${short_desc/Python2/Python3.4}"
 	pkg_install() {
-		vmove /usr/bin/markdown_py3
-		vmove /usr/lib/python3.4
-		vinstall ${wrksrc}/LICENSE.md 644 usr/share/licenses/${pkgname} LICENSE
+		vmove usr/bin/markdown_py3
+		vmove usr/lib/python3.4
+		vlicense ${wrksrc}/LICENSE.md LICENSE
 	}
 }