diff --git a/databases/puppetdb-terminus5/Makefile b/databases/puppetdb-terminus5/Makefile
index 03452f096443..e9244baea446 100644
--- a/databases/puppetdb-terminus5/Makefile
+++ b/databases/puppetdb-terminus5/Makefile
@@ -1,28 +1,28 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb-terminus
-PORTVERSION=	5.2.17
+PORTVERSION=	5.2.18
 CATEGORIES=	databases ruby
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	5
 DISTNAME=	puppetdb-${PORTVERSION}
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend terminus module
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	puppet5>=0:sysutils/puppet5
 
 CONFLICTS_INSTALL=	puppetdb-terminus4-* puppetdb-terminus6-*
 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-terminus5/distinfo b/databases/puppetdb-terminus5/distinfo
index 60eca450ea11..3dee35c620b3 100644
--- a/databases/puppetdb-terminus5/distinfo
+++ b/databases/puppetdb-terminus5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595536309
-SHA256 (puppetdb-5.2.17.tar.gz) = db07b1649fa5214bf9c315d3cfebe90102fb8001dd9145610fdfe2f9cf052a68
-SIZE (puppetdb-5.2.17.tar.gz) = 26341753
+TIMESTAMP = 1596568920
+SHA256 (puppetdb-5.2.18.tar.gz) = 31cda8f0a637ead5c316679905590310dc31c6795784e8d4420772c92ffca669
+SIZE (puppetdb-5.2.18.tar.gz) = 26342672
diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
index 1499ca777368..fe0c2de435c0 100644
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@@ -1,50 +1,50 @@
 # $FreeBSD$
 
 PORTNAME=	puppetdb
-PORTVERSION=	5.2.17
+PORTVERSION=	5.2.18
 CATEGORIES=	databases java
 MASTER_SITES=	https://downloads.puppetlabs.com/puppetdb/
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	puppet@FreeBSD.org
 COMMENT=	PuppetDB storeconfigs backend
 
 LICENSE=	APACHE20
 
 RUN_DEPENDS=	bash:shells/bash
 
 USE_RC_SUBR=	puppetdb
 
 CONFLICTS_INSTALL=	puppetdb4-* puppetdb5-*
 USES=		shebangfix
 SHEBANG_FILES=	ext/bin/puppetdb \
 		ext/cli/anonymize \
 		ext/cli/config-migration \
 		ext/cli/foreground \
 		ext/cli/upgrade \
 		ext/cli/ssl-setup \
 		ext/cli/start \
 		ext/cli/stop \
 		ext/cli/reload \
 		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/puppetdb5/distinfo b/databases/puppetdb5/distinfo
index fa3bfc4b86f7..6c21d1f2e64d 100644
--- a/databases/puppetdb5/distinfo
+++ b/databases/puppetdb5/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1595536290
-SHA256 (puppetdb-5.2.17.tar.gz) = db07b1649fa5214bf9c315d3cfebe90102fb8001dd9145610fdfe2f9cf052a68
-SIZE (puppetdb-5.2.17.tar.gz) = 26341753
+TIMESTAMP = 1596568909
+SHA256 (puppetdb-5.2.18.tar.gz) = 31cda8f0a637ead5c316679905590310dc31c6795784e8d4420772c92ffca669
+SIZE (puppetdb-5.2.18.tar.gz) = 26342672