diff --git a/databases/puppetdb-terminus6/Makefile b/databases/puppetdb-terminus6/Makefile
index cb1c5eeca7c2..4237d10c0457 100644
--- a/databases/puppetdb-terminus6/Makefile
+++ b/databases/puppetdb-terminus6/Makefile
@@ -1,26 +1,26 @@
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	6.20.2
+PORTVERSION=	6.21.0
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
 DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet6>=0:sysutils/puppet6
 
 CONFLICTS_INSTALL=	puppetdb-terminus5 puppetdb-terminus7
 USE_RUBY=	yes
 NO_BUILD=	yes
 USES=		gmake
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} ${GMAKE} install-puppetdb-termini
 
 .include <bsd.port.mk>
diff --git a/databases/puppetdb-terminus6/distinfo b/databases/puppetdb-terminus6/distinfo
index c9d0e87d87e7..d90ef17c82bb 100644
--- a/databases/puppetdb-terminus6/distinfo
+++ b/databases/puppetdb-terminus6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645241655
-SHA256 (puppetdb-6.20.2.tar.gz) = ebbb70bd629c6aa6375f03fa7fee380b28651668a770fb4d082b98712a237c04
-SIZE (puppetdb-6.20.2.tar.gz) = 48359562
+TIMESTAMP = 1650667243
+SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb
+SIZE (puppetdb-6.21.0.tar.gz) = 48757121
diff --git a/databases/puppetdb6/Makefile b/databases/puppetdb6/Makefile
index 71781f6be0a6..3f4c869667d7 100644
--- a/databases/puppetdb6/Makefile
+++ b/databases/puppetdb6/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	puppetdb
-PORTVERSION=	6.20.2
+PORTVERSION=	6.21.0
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	puppetdb5 puppetdb7
 USES=		cpe shebangfix
 CPE_VENDOR=	puppet
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/ssl-setup \
 		ext/cli/start \
 		ext/cli/stop \
 		ext/cli/reload \
 		ext/cli/upgrade \
 		ext/ezbake-functions.sh
 USE_JAVA=	yes
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 USERS=		puppetdb
 GROUPS=		puppetdb
 
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	pkg-message
 
 post-patch:
 .for file in Makefile ext/bin/puppetdb ext/cli/ssl-setup \
 	ext/config/conf.d/jetty.ini ext/config/conf.d/config.ini
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e "s|%%DATADIR%%|${DATADIR}|" ${WRKSRC}/ext/bin/puppetdb
 
 do-install:
 	@cd ${WRKSRC} && ${SETENV} DESTDIR=${STAGEDIR} make install-puppetdb
 
 .include <bsd.port.mk>
diff --git a/databases/puppetdb6/distinfo b/databases/puppetdb6/distinfo
index eae8fb771da1..b9593073b2cb 100644
--- a/databases/puppetdb6/distinfo
+++ b/databases/puppetdb6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645241635
-SHA256 (puppetdb-6.20.2.tar.gz) = ebbb70bd629c6aa6375f03fa7fee380b28651668a770fb4d082b98712a237c04
-SIZE (puppetdb-6.20.2.tar.gz) = 48359562
+TIMESTAMP = 1650667141
+SHA256 (puppetdb-6.21.0.tar.gz) = add14d3ef781a15c857a7f6ea18b89b422457428fa65d1223ecfd05a2c1852fb
+SIZE (puppetdb-6.21.0.tar.gz) = 48757121