diff --git a/devel/pylint/Makefile b/devel/pylint/Makefile
index c2a1ab69f5e8..563f2121ca04 100644
--- a/devel/pylint/Makefile
+++ b/devel/pylint/Makefile
@@ -1,35 +1,39 @@
 # Created by: Hye-Shik Chang
 # $FreeBSD$
 
 PORTNAME=	pylint
 PORTVERSION=	1.6.5
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Analyzes python source code looking for bugs and signs of poor quality
 
-LICENSE=	LGPL21
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}astroid>=1.4.5:devel/py-astroid \
 		${PYTHON_PKGNAMEPREFIX}isort>=4.2.5:devel/py-isort \
 		${PYTHON_PKGNAMEPREFIX}mccabe>=0:devel/py-mccabe \
 		${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six
 
-USES=		python
-USE_PYTHON=	distutils concurrent
+OPTIONS_DEFINE=	GUI
+
 NO_ARCH=	yes
+USE_PYTHON=	concurrent distutils
+USES=		python shebangfix
 
-OPTIONS_DEFINE=	GUI
+SHEBANG_FILES=	pylint/test/data/ascript
 
-GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>0:x11-toolkits/py-tkinter
+GUI_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}tkinter>=0:x11-toolkits/py-tkinter
 
 .include <bsd.port.pre.mk>
 
-.if ${PYTHON_MAJOR_VER} == 2
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser \
-		${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache
+.if ${PYTHON_REL} < 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}backports.functools_lru_cache>=0:devel/py-backports.functools_lru_cache \
+		${PYTHON_PKGNAMEPREFIX}configparser>=0:devel/py-configparser
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/pylint/pkg-descr b/devel/pylint/pkg-descr
index b7abe8ed919b..051e4c521757 100644
--- a/devel/pylint/pkg-descr
+++ b/devel/pylint/pkg-descr
@@ -1,9 +1,11 @@
-Pylint is a python tool that checks if a module satisfy a coding
-standard. Pylint can be seen as another PyChecker since nearly all
-tests you can do with PyChecker can also be done with Pylint. But
-Pylint offers some more features, like checking line-code's length,
-checking if variable names are well-formed according to your coding
-standard, or checking if declared interfaces are truly implemented,
-and much more.
+Pylint is a Python source code analyzer which looks for programming errors,
+helps enforcing a coding standard and sniffs for some code smells (as defined in
+Martin Fowler’s Refactoring book).
 
-WWW: http://www.pylint.org
+Pylint has many rules enabled by default, way too much to silence them all on a
+minimally sized program. It’s highly configurable and handle pragmas to control
+it from within your code. Additionally, it is possible to write plugins to add
+your own checks.
+
+WWW: https://pypi.python.org/pypi/pylint
+WWW: https://github.com/PyCQA/pylint