diff --git a/devel/py-asn1-modules/Makefile b/devel/py-asn1-modules/Makefile
index eadcd021c6d2..6ca4e911a1f4 100644
--- a/devel/py-asn1-modules/Makefile
+++ b/devel/py-asn1-modules/Makefile
@@ -2,43 +2,34 @@
 
 PORTNAME=	asn1-modules
 PORTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	devel python
-MASTER_SITES=	SF/pyasn1/py${PORTNAME}/${PORTVERSION} \
-		CHEESESHOP
+MASTER_SITES=	SF/pyasn1/py${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	py${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	rm@FreeBSD.org
 COMMENT=	Collection of ASN.1 data structures for py-asn1
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}asn1>=0.1.4:${PORTSDIR}/devel/py-asn1
 
+USES=			shebangfix
+SHEBANG_FILES=		tools/*.py
 USE_PYTHON=		yes
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=	pyasn1-modules
-
-DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-
-BASEDOCS=	CHANGES README
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
+DOCSDIR=	${PREFIX}/share/doc/${PYTHON_PKGNAMEPREFIX}${PORTNAME}
+PORTDOCS=	CHANGES README
 TOOLS=		cmpdump.py crldump.py crmfdump.py ocspclient.py ocspreqdump.py \
 		ocsprspdump.py ocspserver.py pkcs10dump.py pkcs1dump.py \
 		pkcs7dump.py pkcs8dump.py snmpget.py x509dump.py
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
 post-install:
-.for t in ${TOOLS}
-	@${INSTALL_SCRIPT} ${WRKSRC}/tools/${t} ${PREFIX}/bin
-.endfor
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-.for f in ${BASEDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.endfor
-.endif
+	${INSTALL_SCRIPT} ${TOOLS:S|^|${WRKSRC}/tools/|} ${STAGEDIR}${PREFIX}/bin
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-asn1-modules/pkg-plist b/devel/py-asn1-modules/pkg-plist
index c0628cac66b3..55f322396b14 100644
--- a/devel/py-asn1-modules/pkg-plist
+++ b/devel/py-asn1-modules/pkg-plist
@@ -11,7 +11,3 @@ bin/pkcs7dump.py
 bin/pkcs8dump.py
 bin/snmpget.py
 bin/x509dump.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%