diff --git a/devel/py-gflags/Makefile b/devel/py-gflags/Makefile
index 587ed0db8a2f..69c16af7a9b5 100644
--- a/devel/py-gflags/Makefile
+++ b/devel/py-gflags/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	gflags
 PORTVERSION=	2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,9 +14,12 @@ COMMENT=	Commandline flags module for Python
 
 LICENSE=	BSD3CLAUSE
 
-USES=		python:2
-USE_PYTHON=	distutils
-PYDISTUTILS_PKGNAME=	python_gflags
+USES=		python:2 shebangfix
+USE_PYTHON=	autoplist distutils
+
+SHEBANG_FILES=	gflags2man.py
+python_OLD_CMD=	${SETENV} python
+python_CMD=	${PYTHON_CMD}
 
 PROJECTHOST=	python-gflags
 
diff --git a/devel/py-gflags/pkg-plist b/devel/py-gflags/pkg-plist
deleted file mode 100644
index 5fcd9c9d5ad1..000000000000
--- a/devel/py-gflags/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/gflags2man.py
-%%PYTHON_SITELIBDIR%%/gflags.py
-%%PYTHON_SITELIBDIR%%/gflags.pyc
-%%PYTHON_SITELIBDIR%%/gflags.pyo
-%%PYTHON_SITELIBDIR%%/gflags_validators.py
-%%PYTHON_SITELIBDIR%%/gflags_validators.pyc
-%%PYTHON_SITELIBDIR%%/gflags_validators.pyo