diff --git a/srcpkgs/pylint/template b/srcpkgs/pylint/template
index 799c7a4ab54..b6ca91fd84c 100644
--- a/srcpkgs/pylint/template
+++ b/srcpkgs/pylint/template
@@ -1,10 +1,11 @@
 # Template file for 'pylint'
 pkgname=pylint
-version=2.3.1
+reverts="2.3.1_1"
+version=1.9.5
 revision=1
 archs=noarch
 wrksrc="pylint-${version}"
-build_style=python-module
+build_style=python2-module
 pycompile_module="pylint"
 hostmakedepends="python-setuptools python3-setuptools"
 depends="python-setuptools python-astroid python-six python-isort python-mccabe
@@ -15,7 +16,7 @@ maintainer="Alessio Sergi <al3hex@gmail.com>"
 homepage="http://www.pylint.org/"
 license="GPL-2.0-or-later"
 distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
-checksum=723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1
+checksum=97a42df23d436c70132971d1dcb9efad2fe5c0c6add55b90161e773caf729300
 
 alternatives="
  pylint:epylint:/usr/bin/epylint2
@@ -37,7 +38,7 @@ post_install() {
 	# create versioned man pages
 	for f in epylint pylint pyreverse symilar; do
 		vman man/${f}.1 ${f}2.1
-		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}2
 	done
 
 	# install example config and emacs files
@@ -46,28 +47,3 @@ post_install() {
 	vsconf elisp/pylint.el
 	vsconf elisp/pylint-flymake.el
 }
-
-python3-pylint_package() {
-	alternatives="
-	 pylint:epylint:/usr/bin/epylint3
-	 pylint:pylint:/usr/bin/pylint3
-	 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:pyreverse.1:/usr/share/man/man1/pyreverse3.1
-	 pylint:symilar.1:/usr/share/man/man1/symilar3.1"
-	archs=noarch
-	pycompile_module="pylint"
-	depends="python3-setuptools python3-astroid python3-six python3-isort python3-mccabe"
-	short_desc="${short_desc/Python2/Python3}"
-	pkg_install() {
-		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
-	}
-}
diff --git a/srcpkgs/python3-pylint b/srcpkgs/python3-pylint
deleted file mode 120000
index 54b18e249c1..00000000000
--- a/srcpkgs/python3-pylint
+++ /dev/null
@@ -1 +0,0 @@
-pylint
\ No newline at end of file
diff --git a/srcpkgs/python3-pylint/template b/srcpkgs/python3-pylint/template
new file mode 100644
index 00000000000..1cb03f8761a
--- /dev/null
+++ b/srcpkgs/python3-pylint/template
@@ -0,0 +1,47 @@
+# Template file for 'python3-pylint'
+pkgname=python3-pylint
+version=2.3.1
+revision=1
+archs=noarch
+wrksrc="pylint-${version}"
+build_style=python3-module
+pycompile_module="pylint"
+hostmakedepends="python3-setuptools"
+depends="python3-setuptools python3-astroid python3-six python3-isort
+ python3-mccabe python3-typed-ast"
+short_desc="Python3 code static checker"
+maintainer="Alessio Sergi <al3hex@gmail.com>"
+homepage="http://www.pylint.org/"
+license="GPL-2.0-or-later"
+distfiles="${PYPI_SITE}/p/pylint/pylint-${version}.tar.gz"
+checksum=723e3db49555abaf9bf79dc474c6b9e2935ad82230b10c1138a71ea41ac0fff1
+
+alternatives="
+ pylint:epylint:/usr/bin/epylint3
+ pylint:pylint:/usr/bin/pylint3
+ 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:pyreverse.1:/usr/share/man/man1/pyreverse3.1
+ pylint:symilar.1:/usr/share/man/man1/symilar3.1"
+
+pre_build() {
+	sed -i '/setup_requires=/d' setup.py
+}
+post_install() {
+	# no tests
+	rm -rf ${DESTDIR}/usr/lib/python*/site-packages/pylint/test
+
+	# create versioned man pages
+	for f in epylint pylint pyreverse symilar; do
+		vman man/${f}.1 ${f}3.1
+		mv ${DESTDIR}/usr/bin/${f} ${DESTDIR}/usr/bin/${f}3
+	done
+
+	# install example config and emacs files
+	vsconf examples/pylintrc
+	vsconf examples/pylintrc_camelcase
+	vsconf elisp/pylint.el
+	vsconf elisp/pylint-flymake.el
+}