diff --git a/srcpkgs/python-yaml/template b/srcpkgs/python-yaml/template
new file mode 100644
index 00000000000..af5bc5511d3
--- /dev/null
+++ b/srcpkgs/python-yaml/template
@@ -0,0 +1,26 @@
+# Template file for 'python-yaml'
+pkgname=python-yaml
+version=3.11
+revision=1
+wrksrc="PyYAML-${version}"
+build_style=python-module
+python_versions="2.7 3.4"
+pycompile_module="pyyaml"
+replaces="pyyaml>=0"
+hostmakedepends="python-setuptools python3.4-setuptools"
+makedepends="libyaml-devel python-devel python3.4-devel"
+short_desc="YAML parser and emitter for Python2"
+maintainer="Juan RP <xtraeme@gmail.com>"
+homepage="http://pyyaml.org/wiki/PyYAML"
+license="MIT"
+distfiles="http://pyyaml.org/download/pyyaml/PyYAML-${version}.tar.gz"
+checksum=c36c938a872e5ff494938b33b14aaa156cb439ec67548fcab3535bb78b0846e8
+
+python3.4-yaml_package() {
+	pycompile_version="3.4"
+	pycompile_module="pyyaml"
+	short_desc="${short_desc/Python2/Python3.4}"
+	pkg_install() {
+		vmove /usr/lib/python3.4
+	}
+}
diff --git a/srcpkgs/python3.4-yaml b/srcpkgs/python3.4-yaml
new file mode 120000
index 00000000000..8ad435a8a6f
--- /dev/null
+++ b/srcpkgs/python3.4-yaml
@@ -0,0 +1 @@
+python-yaml
\ No newline at end of file
diff --git a/srcpkgs/pyyaml/template b/srcpkgs/pyyaml/template
deleted file mode 100644
index 9fc48f92be8..00000000000
--- a/srcpkgs/pyyaml/template
+++ /dev/null
@@ -1,15 +0,0 @@
-# Template file for 'pyyaml'
-pkgname=pyyaml
-version=3.10
-revision=3
-wrksrc="PyYAML-${version}"
-build_style=python-module
-hostmakedepends="python"
-makedepends="libyaml-devel python-devel"
-pycompile_module="pyyaml"
-short_desc="YAML parser and emitter for Python"
-maintainer="Juan RP <xtraeme@gmail.com>"
-homepage="http://pyyaml.org/wiki/PyYAML"
-license="MIT"
-distfiles="http://${pkgname}.org/download/${pkgname}/PyYAML-${version}.tar.gz"
-checksum=e713da45c96ca53a3a8b48140d4120374db622df16ab71759c9ceb5b8d46fe7c