diff --git a/www/py-puppetboard/Makefile b/www/py-puppetboard/Makefile
index ac69134a827d..b5c4fc383d40 100644
--- a/www/py-puppetboard/Makefile
+++ b/www/py-puppetboard/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	puppetboard
-PORTVERSION=	3.5.1
+PORTVERSION=	3.6.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 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
 
 NO_ARCH=	yes
 
 CONFLICTS_INSTALL=puppetboard02 puppetboard03
 
 GH_ACCOUNT=	voxpupuli
 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}/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 ce7e8ffba747..0212c59bc583 100644
--- a/www/py-puppetboard/distinfo
+++ b/www/py-puppetboard/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1653958849
-SHA256 (voxpupuli-puppetboard-v3.5.1_GH0.tar.gz) = a1bb304b392c085e8b5ad3fb721db6c29fe15349875d113a8c0f4f25f1639c19
-SIZE (voxpupuli-puppetboard-v3.5.1_GH0.tar.gz) = 4398669
+TIMESTAMP = 1654893318
+SHA256 (voxpupuli-puppetboard-v3.6.0_GH0.tar.gz) = d2e3af03e0cba3255bf203f76d24f5022cb10a856e2dbb53a7dde35593dd3f70
+SIZE (voxpupuli-puppetboard-v3.6.0_GH0.tar.gz) = 4398180