diff --git a/srcpkgs/pylint/python3-pylint.INSTALL.msg b/srcpkgs/pylint/python3-pylint.INSTALL.msg
new file mode 100644
index 00000000000..908daa02973
--- /dev/null
+++ b/srcpkgs/pylint/python3-pylint.INSTALL.msg
@@ -0,0 +1 @@
+To use pylint GUI install python3-tkinter.
diff --git a/srcpkgs/pylint/python3.4-pylint.INSTALL.msg b/srcpkgs/pylint/python3.4-pylint.INSTALL.msg
deleted file mode 100644
index bb559c128b7..00000000000
--- a/srcpkgs/pylint/python3.4-pylint.INSTALL.msg
+++ /dev/null
@@ -1 +0,0 @@
-To use pylint GUI install python3.4-tkinter.
diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 2ef32fcf1a1..d7c323b8dd1 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,12 +1,11 @@
 # Template file for 'pylint'
 pkgname=pylint
 version=1.5.6
-revision=1
+revision=2
 noarch=yes
 wrksrc="pylint-${version}"
 build_style=python-module
-python_versions="2.7 3.4"
-hostmakedepends="python-setuptools python3.4-setuptools"
+hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-astroid>=1.4.1 python-six"
 pycompile_module="pylint"
 short_desc="Python2 code static checker"
@@ -17,16 +16,16 @@ distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
 checksum=303bdd755048feec2c1fe1ea16e8f4306636f02845510ff3d5922ae2d6fe35cc
 
 alternatives="
- pylint:epylint:/usr/bin/epylint2.7
- pylint:pylint:/usr/bin/pylint2.7
- pylint:pylint-gui:/usr/bin/pylint-gui2.7
- pylint:pyreverse:/usr/bin/pyreverse2.7
- pylint:symilar:/usr/bin/symilar2.7
- pylint:epylint.1:/usr/share/man/man1/epylint2.7.1
- pylint:pylint.1:/usr/share/man/man1/pylint2.7.1
- pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui2.7.1
- pylint:pyreverse.1:/usr/share/man/man1/pyreverse2.7.1
- pylint:symilar.1:/usr/share/man/man1/symilar2.7.1"
+ pylint:epylint:/usr/bin/epylint2
+ pylint:pylint:/usr/bin/pylint2
+ pylint:pylint-gui:/usr/bin/pylint-gui2
+ pylint:pyreverse:/usr/bin/pyreverse2
+ pylint:symilar:/usr/bin/symilar2
+ pylint:epylint.1:/usr/share/man/man1/epylint2.1
+ pylint:pylint.1:/usr/share/man/man1/pylint2.1
+ pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui2.1
+ pylint:pyreverse.1:/usr/share/man/man1/pyreverse2.1
+ pylint:symilar.1:/usr/share/man/man1/symilar2.1"
 
 post_install() {
 	# no tests
@@ -34,8 +33,8 @@ post_install() {
 
 	# create versioned man pages
 	for f in epylint pylint pylint-gui pyreverse symilar; do
-		vman man/${f}.1 ${f}2.7.1
-		vman man/${f}.1 ${f}3.4.1
+		vman man/${f}.1 ${f}2.1
+		vman man/${f}.1 ${f}3.1
 	done
 
 	# install example config and emacs files
@@ -45,30 +44,36 @@ post_install() {
 	vsconf elisp/pylint-flymake.el
 }
 
-python3.4-pylint_package() {
+python3-pylint_package() {
 	alternatives="
-	 pylint:epylint:/usr/bin/epylint3.4
-	 pylint:pylint:/usr/bin/pylint3.4
-	 pylint:pylint-gui:/usr/bin/pylint-gui3.4
-	 pylint:pyreverse:/usr/bin/pyreverse3.4
-	 pylint:symilar:/usr/bin/symilar3.4
-	 pylint:epylint.1:/usr/share/man/man1/epylint3.4.1
-	 pylint:pylint.1:/usr/share/man/man1/pylint3.4.1
-	 pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui3.4.1
-	 pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.4.1
-	 pylint:symilar.1:/usr/share/man/man1/symilar3.4.1"
+	 pylint:epylint:/usr/bin/epylint3
+	 pylint:pylint:/usr/bin/pylint3
+	 pylint:pylint-gui:/usr/bin/pylint-gui3
+	 pylint:pyreverse:/usr/bin/pyreverse3
+	 pylint:symilar:/usr/bin/symilar3
+	 pylint:epylint.1:/usr/share/man/man1/epylint3.1
+	 pylint:pylint.1:/usr/share/man/man1/pylint3.1
+	 pylint:pylint-gui.1:/usr/share/man/man1/pylint-gui3.1
+	 pylint:pyreverse.1:/usr/share/man/man1/pyreverse3.1
+	 pylint:symilar.1:/usr/share/man/man1/symilar3.1"
 	noarch=yes
-	short_desc="${short_desc/Python2/Python3.4}"
-	depends="python3.4-setuptools python3.4-astroid>=1.4.1 python3.4-six"
-	pycompile_version="3.4"
+	short_desc="${short_desc/Python2/Python3}"
+	depends="python3-setuptools python3-astroid>=1.4.1 python3-six"
 	pycompile_module="pylint"
+	replaces="python3.4-pylint>=0"
 	pkg_install() {
-		vmove usr/bin/*3.4
-		vmove usr/lib/python3.4
-		vmove usr/share/man/man1/*3.4.1
+		vmove usr/bin/*3
+		vmove usr/lib/python3*
+		vmove usr/share/man/man1/*3.1
 		vsconf examples/pylintrc
 		vsconf examples/pylintrc_camelcase
 		vsconf elisp/pylint.el
 		vsconf elisp/pylint-flymake.el
 	}
 }
+python3.4-pylint_package() {
+	noarch=yes
+	build_style=meta
+	short_desc="${short_desc/Python2/Python3.4} (transitional dummy package)"
+	depends="python3-pylint>=${version}_${revision}"
+}
diff --git a/srcpkgs/python3-pylint b/srcpkgs/python3-pylint
new file mode 120000
index 00000000000..54b18e249c1
--- /dev/null
+++ b/srcpkgs/python3-pylint
@@ -0,0 +1 @@
+pylint
\ No newline at end of file