diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile
index f75ee045c096..47e43d7a473b 100644
--- a/www/py-puppetboard/Makefile
+++ b/www/py-puppetboard/Makefile
@@ -1,38 +1,43 @@
 PORTNAME=	puppetboard
 PORTVERSION=	3.1.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
+PATCHFILES=	a9b1903bf0fd71c8d2c0d100396646856ff8fbe4.patch
+PATCH_SITES=	https://github.com/voxpupuli/puppetboard/commit/
+PATCH_DIST_STRIP=-p1
+
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	Web interface to PuppetDB
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}CommonMark>=0.7.2:textproc/py-CommonMark@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask>=0.12:www/py-flask@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}Flask-WTF>=0.14.2:www/py-flask-wtf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}markupsafe>=0.19:textproc/py-markupsafe@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0.16.0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pypuppetdb>=0.3.3:databases/py-pypuppetdb@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}requests>=2.13.0:www/py-requests@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist distutils
 
 CONFLICTS_INSTALL=puppetboard02-* puppetboard03-*
 
 GH_ACCOUNT=	voxpupuli
-PLIST_FILES=	"@sample etc/puppetboard/default_settings.py.sample"
+PLIST_FILES=	"@sample etc/puppetboard/settings.py.sample"
 
 post-patch:
 	${REINPLACE_CMD} -e '/requirements_for_tests/,+2d' \
 		${WRKSRC}/setup.py
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/puppetboard
-	${CP} ${WRKSRC}/puppetboard/default_settings.py ${STAGEDIR}${PREFIX}/etc/puppetboard/default_settings.py.sample
+	${CP} ${WRKSRC}/settings.py.sample ${STAGEDIR}${PREFIX}/etc/puppetboard/settings.py.sample
 
 .include <bsd.port.mk>
diff --git a/www/py-puppetboard/distinfo b/www/py-puppetboard/distinfo
index 056fad3f07a9..3c13faaee452 100644
--- a/www/py-puppetboard/distinfo
+++ b/www/py-puppetboard/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1621020310
+TIMESTAMP = 1628875502
 SHA256 (voxpupuli-puppetboard-v3.1.0_GH0.tar.gz) = 651991af5536d9d92db4450255f08aceca8b541397f419d5bf094ee5d4a371ad
 SIZE (voxpupuli-puppetboard-v3.1.0_GH0.tar.gz) = 2668033
+SHA256 (a9b1903bf0fd71c8d2c0d100396646856ff8fbe4.patch) = 763eb62ab0e4ee3ea698cc3011fe0be2b9e1096f5775da2ad9c5e499a36a708b
+SIZE (a9b1903bf0fd71c8d2c0d100396646856ff8fbe4.patch) = 1376