Index: security/py-xkcdpass/Makefile
===================================================================
--- security/py-xkcdpass/Makefile
+++ security/py-xkcdpass/Makefile
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	xkcdpass
+DISTVERSIONPREFIX=	${PORTNAME}-
 DISTVERSION=	1.17.4
 CATEGORIES=	security sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -11,13 +12,24 @@
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.BSD
 
-USES=		tar python:2.7+
+USES=		python
 USE_PYTHON=	autoplist distutils
 USE_GITHUB=	yes
 GH_ACCOUNT=	jwfh
-GH_TAGNAME=	${PORTNAME}-${DISTVERSION}
 
-post-install: 
-	${INSTALL_MAN} ${WRKSRC}/xkcdpass.1 ${STAGEDIR}${PREFIX}/man/man1
+OPTIONS_DEFINE=	DOCS
+
+MAN_FILES=	${PORTNAME}.1
+README_FILES=	README.rst
+PLIST_FILES+=	${MAN_FILES:S|^|man/man1/|:S|$|.gz|}
+DOCS_PLIST_FILES=	${README_FILES:S|^|${DOCSDIR_REL}/|}
+
+post-stage:
+	${INSTALL_MAN} ${MAN_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${MANPREFIX}/man/man1
+
+do-install-DOCS-on:
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${README_FILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
+
 
 .include <bsd.port.mk>
Index: security/py-xkcdpass/distinfo
===================================================================
--- security/py-xkcdpass/distinfo
+++ security/py-xkcdpass/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577419061
-SHA256 (jwfh-xkcdpass-1.17.4-xkcdpass-1.17.4_GH0.tar.gz) = 422761d7c758d197f34ccf20a5bf5ef252b6ea9681c0f6de5b232c88cb133924
-SIZE (jwfh-xkcdpass-1.17.4-xkcdpass-1.17.4_GH0.tar.gz) = 2197541
+TIMESTAMP = 1589148089
+SHA256 (jwfh-xkcdpass-xkcdpass-1.17.4_GH0.tar.gz) = 422761d7c758d197f34ccf20a5bf5ef252b6ea9681c0f6de5b232c88cb133924
+SIZE (jwfh-xkcdpass-xkcdpass-1.17.4_GH0.tar.gz) = 2197541
Index: security/py-xkcdpass/pkg-descr
===================================================================
--- security/py-xkcdpass/pkg-descr
+++ security/py-xkcdpass/pkg-descr
@@ -1,4 +1,8 @@
-Python-based password generator styled after XKCD 936.
+A flexible and scriptable password generator which generates
+strong diceword-style passphrases, inspired by XKCD 936.
+
+  $ xkcdpass
+  > correct horse battery staple
 
 Usable as standalone script or a module within a larger
 Python project.
Index: security/py-xkcdpass/pkg-plist
===================================================================
--- security/py-xkcdpass/pkg-plist
+++ /dev/null
@@ -1,25 +0,0 @@
-bin/xkcdpass
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/PKG-INFO
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/SOURCES.txt
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/dependency_links.txt
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/entry_points.txt
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/not-zip-safe
-%%PYTHON_SITELIBDIR%%/xkcdpass-1.17.4-py%%PYTHON_VER%%.egg-info/top_level.txt
-%%PYTHON_SITELIBDIR%%/xkcdpass/__init__.py
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/eff-long
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/eff-short
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/eff-special
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/fin-kotus
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/fr-freelang
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/fr-freelang-bernard-vivier
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/ger-anlx
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/ita-wiki
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/legacy
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/nor-nb
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/pt-ipublicis
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/pt-l33t-ipublicis
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/pt-pt-ipublicis
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/pt-pt-l33t-ipublicis
-%%PYTHON_SITELIBDIR%%/xkcdpass/static/spa-mich
-%%PYTHON_SITELIBDIR%%/xkcdpass/xkcd_password.py
-man/man1/xkcdpass.1.gz