diff --git a/news/xpn/Makefile b/news/xpn/Makefile
index cee03d62661c..7c7df9f0792c 100644
--- a/news/xpn/Makefile
+++ b/news/xpn/Makefile
@@ -3,25 +3,29 @@
 
 PORTNAME=	xpn
 PORTVERSION=	1.2.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	news python
-MASTER_SITES=	http://xpn.altervista.org/codice/ \
-		http://nivi.interfree.it/distfiles/${PORTNAME}/
+MASTER_SITES=	http://xpn.altervista.org/codice/
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	X Python Newsreader
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
+LICENSE=	GPLv2
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}gtk2>=2.24.0:${PORTSDIR}/x11-toolkits/py-gtk2 \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=2.7.9:${PORTSDIR}/databases/py-sqlite3
 
 NO_BUILD=	yes
 
-FIND_DIRS=	-type d
-FIND_DATA=	-type f -mindepth 2 -not -name "*~"
+python_OLD_CMD=	/usr/bin/env python
+# we want a versioned python command
+python_CMD=	${PYTHON_CMD}
 
+SHEBANG_FILES=	${XPN}
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} XPN=${XPN}
 
-USES=		gettext python
+USES=		gettext python:2 shebangfix
 
 XPN=	${PORTNAME}.py
 
@@ -31,8 +35,8 @@ do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/${XPN} ${STAGEDIR}${DATADIR}/${XPN}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-	cd ${WRKSRC} && ${FIND} . ${FIND_DIRS} -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} ";"
-	cd ${WRKSRC} && ${FIND} . ${FIND_DATA} -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} ";"
+	(cd ${WRKSRC} && \
+	${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR} "-mindepth 2")
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.html ${STAGEDIR}${DOCSDIR}
 
diff --git a/news/xpn/pkg-descr b/news/xpn/pkg-descr
index ccb988ca550f..66e9c77e42f0 100644
--- a/news/xpn/pkg-descr
+++ b/news/xpn/pkg-descr
@@ -7,6 +7,6 @@ charset, however is always possible to override this choice.
 
 There also other useful features like scoring, filtered views,
 random tag-lines, external editor support, one-key navigation,
-ROT13, spoiler char ...
+ROT13, spoiler char.
 
-WWW:	http://xpn.altervista.org/
+WWW: http://xpn.altervista.org/
diff --git a/news/xpn/pkg-plist b/news/xpn/pkg-plist
index f68719a01aea..552d145d1c72 100644
--- a/news/xpn/pkg-plist
+++ b/news/xpn/pkg-plist
@@ -129,14 +129,3 @@ bin/xpn
 %%DATADIR%%/xpn_src/__init__.py
 %%DATADIR%%/xpn_src/add_tag.py
 %%DATADIR%%/xpn_src/nntplib_ssl.py
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm %%DATADIR%%/xpn_src
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/lang/it/LC_MESSAGES
-@dirrm %%DATADIR%%/lang/it
-@dirrm %%DATADIR%%/lang/fr/LC_MESSAGES
-@dirrm %%DATADIR%%/lang/fr
-@dirrm %%DATADIR%%/lang/de/LC_MESSAGES
-@dirrm %%DATADIR%%/lang/de
-@dirrm %%DATADIR%%/lang
-@dirrm %%DATADIR%%