diff --git a/news/hellanzb/Makefile b/news/hellanzb/Makefile
index ddc8d5f76dc..749ce57f197 100644
--- a/news/hellanzb/Makefile
+++ b/news/hellanzb/Makefile
@@ -1,13 +1,14 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/20 09:48:38 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/01/14 19:12:12 jasper Exp $
 
 COMMENT=		retrieve and process nzb-files
 
 DISTNAME=		hellanzb-0.13
-REVISION =		4
+REVISION =		5
 CATEGORIES=		news
 
 HOMEPAGE=		http://www.hellanzb.com/trac/
 
+# BSD-3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -23,12 +24,11 @@ RUN_DEPENDS=		archivers/par2cmdline \
 			devel/py-twisted/web \
 			news/py-yenc
 
+MODPY_ADJ_FILES=	hellanzb.py
+
 NO_REGRESS=		Yes
 
 pre-configure:
-	@find ${WRKDIST} -name \*.py | \
-		xargs perl -pi -e 's,/usr/bin/env python,${MODPY_BIN},g'
-	@perl -pi -e 's,!!SYSCONFDIR!!,${SYSCONFDIR},' \
-		${WRKSRC}/Hellanzb/Core.py
+	${SUBST_CMD} ${WRKSRC}/Hellanzb/Core.py
 
 .include <bsd.port.mk>
diff --git a/news/hellanzb/patches/patch-Hellanzb_Core_py b/news/hellanzb/patches/patch-Hellanzb_Core_py
index 629062ce809..789b37fdec8 100644
--- a/news/hellanzb/patches/patch-Hellanzb_Core_py
+++ b/news/hellanzb/patches/patch-Hellanzb_Core_py
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Hellanzb_Core_py,v 1.1.1.1 2007/06/24 16:57:40 jasper Exp $
+$OpenBSD: patch-Hellanzb_Core_py,v 1.2 2011/01/14 19:12:13 jasper Exp $
 --- Hellanzb/Core.py.orig	Mon Jun 11 00:58:14 2007
 +++ Hellanzb/Core.py	Mon Jun 11 00:58:40 2007
 @@ -35,7 +35,7 @@ def findAndLoadConfig(optionalConfigFile = None):
@@ -6,7 +6,7 @@ $OpenBSD: patch-Hellanzb_Core_py,v 1.1.1.1 2007/06/24 16:57:40 jasper Exp $
  
      # look for conf in this order: sys.prefix, ./, or ./etc/
 -    confDirs = [os.path.join(sys.prefix, 'etc')]
-+    confDirs = [os.path.join('!!SYSCONFDIR!!')]
++    confDirs = [os.path.join('${SYSCONFDIR}')]
      try:
          confDirs.append(os.path.join(os.getcwd(), 'etc'))
          confDirs.append(os.getcwd())
diff --git a/news/hellanzb/pkg/PLIST b/news/hellanzb/pkg/PLIST
index 987bd0fb2ab..77610ea7152 100644
--- a/news/hellanzb/pkg/PLIST
+++ b/news/hellanzb/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2007/06/24 16:57:40 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.2 2011/01/14 19:12:13 jasper Exp $
 bin/hellanzb.py
 lib/python${MODPY_VERSION}/site-packages/Hellanzb/
 lib/python${MODPY_VERSION}/site-packages/Hellanzb/Core.py
@@ -65,6 +65,7 @@ lib/python${MODPY_VERSION}/site-packages/Hellanzb/external/elementtree/SimpleXML
 lib/python${MODPY_VERSION}/site-packages/Hellanzb/external/elementtree/SimpleXMLWriter.pyc
 lib/python${MODPY_VERSION}/site-packages/Hellanzb/external/elementtree/__init__.py
 lib/python${MODPY_VERSION}/site-packages/Hellanzb/external/elementtree/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/hellanzb-0.13-py${MODPY_VERSION}.egg-info
 share/doc/hellanzb/
 share/doc/hellanzb/README
 share/examples/hellanzb/