diff --git a/security/py-fail2ban/Makefile b/security/py-fail2ban/Makefile
index 39fbca05b434..f2c5341a78b1 100644
--- a/security/py-fail2ban/Makefile
+++ b/security/py-fail2ban/Makefile
@@ -1,4 +1,4 @@
-# Created by:    Philip M. Gollucci <pgollucci@p6m7g8.com>
+# Created by: Philip M. Gollucci <pgollucci@p6m7g8.com>
 # $FreeBSD$
 
 PORTNAME=	fail2ban
@@ -15,11 +15,11 @@ LICENSE=	GPLv2
 
 GITVERSION=	0-g0b5c66f
 FETCH_ARGS=	-pRr
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTNAME}-e59babb
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-e59babb
 
 MAKE_JOBS_SAFE=	yes
 
-USE_PYTHON=	2.5-2.7
+USE_PYTHON=	-2.7
 USE_PYDISTUTILS=	yes
 
 USE_RC_SUBR=	fail2ban
@@ -27,7 +27,7 @@ SUB_LIST+=	PYTHON_CMD=${PYTHON_CMD}
 
 PYDISTUTILS_INSTALLARGS+=	--install-purelib=${PYTHON_SITELIBDIR} \
 				--install-data=${ETCDIR}
-PYDISTUTILS_EGGINFO=	${PORTNAME}-0.8.7-py${PYTHON_VER}.egg-info
+PYDISTUTILS_PKGVERSION=	0.8.7
 
 FILES=	${WRKSRC}/fail2ban-regex \
 		${WRKSRC}/man/fail2ban-client.1 \
@@ -40,6 +40,6 @@ post-patch:
 	@${ECHO_CMD} ${FILES} | ${XARGS} ${REINPLACE_CMD} -e 's,/etc/fail2ban,${ETCDIR},g'
 
 post-install:
-	@${CAT} pkg-message
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/py-fail2ban/pkg-descr b/security/py-fail2ban/pkg-descr
index 22c794b1decb..e6f1adbb4a4b 100644
--- a/security/py-fail2ban/pkg-descr
+++ b/security/py-fail2ban/pkg-descr
@@ -1,5 +1,5 @@
-Fail2ban scans log files like /var/log/pwdfail or /var/log/apache/error_log 
-and bans IP that makes too many password failures. It updates 
-firewall rules to reject the IP address. 
+Fail2ban scans log files like /var/log/pwdfail or /var/log/apache/error_log
+and bans IP that makes too many password failures. It updates firewall rules
+to reject the IP address.
 
 WWW: http://www.fail2ban.org/wiki/index.php/Main_Page
diff --git a/security/py-fail2ban/pkg-message b/security/py-fail2ban/pkg-message
index 4be027fee7f1..479bc235b3a4 100644
--- a/security/py-fail2ban/pkg-message
+++ b/security/py-fail2ban/pkg-message
@@ -11,5 +11,3 @@ For more information, see the official manual:
 http://www.fail2ban.org/wiki/index.php/MANUAL_0_8#Configuration
 
 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-