diff --git a/databases/puppetdb5/Makefile b/databases/puppetdb5/Makefile
index 2670b57cd52..16f7efdaa23 100644
--- a/databases/puppetdb5/Makefile
+++ b/databases/puppetdb5/Makefile
@@ -1,17 +1,15 @@
-# $OpenBSD: Makefile,v 1.12 2018/11/06 14:48:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2018/11/12 07:15:56 sebastia Exp $
 
 COMMENT-main=	fast, scalable, and reliable data warehouse for Puppet
 COMMENT-plugin= PuppetDB terminus plugin
 
-V=		5.2.4
+V=		5.2.6
 DISTNAME=	puppetdb-$V
 PKGNAME-main=	${DISTNAME}
 PKGNAME-plugin= puppetdb-termini-$V
 CATEGORIES=	databases
-REVISION-main=	0
-REVISION-plugin=1
 
-HOMEPAGE=	http://docs.puppetlabs.com/puppetdb/latest/
+HOMEPAGE=	https://puppet.com/docs/puppetdb/
 
 MAINTAINER=	Sebastian Reitenbach <sebastia@openbsd.org>
 
diff --git a/databases/puppetdb5/distinfo b/databases/puppetdb5/distinfo
index 0e6d3ca98a0..22c9ac792e9 100644
--- a/databases/puppetdb5/distinfo
+++ b/databases/puppetdb5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (puppetdb-5.2.4.tar.gz) = cN9ZVGAljYXkzTHV/rc05cxuDl+W7gkdIU7U8FHGfI4=
-SIZE (puppetdb-5.2.4.tar.gz) = 25438658
+SHA256 (puppetdb-5.2.6.tar.gz) = xj/OcHdet9hKYuKeZIHXHDWaYrpxQjRyb3noezc8tU8=
+SIZE (puppetdb-5.2.6.tar.gz) = 25637942
diff --git a/databases/puppetdb5/patches/patch-Makefile b/databases/puppetdb5/patches/patch-Makefile
index 9d3de80ae75..f5ac7b8a766 100644
--- a/databases/puppetdb5/patches/patch-Makefile
+++ b/databases/puppetdb5/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/11/20 12:47:32 sebastia Exp $
+$OpenBSD: patch-Makefile,v 1.2 2018/11/12 07:15:56 sebastia Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
@@ -18,10 +18,10 @@ Index: Makefile
  
  install-puppetdb:
  	install -d -m 0755 "$(DESTDIR)$(datadir)/puppetdb"
-@@ -30,7 +30,6 @@ install-puppetdb:
- 	install -m 0755 ext/cli/config-migration "$(DESTDIR)$(datadir)/puppetdb/cli/apps/config-migration"
+@@ -31,7 +31,6 @@ install-puppetdb:
  	install -m 0755 ext/cli/foreground "$(DESTDIR)$(datadir)/puppetdb/cli/apps/foreground"
  	install -m 0755 ext/cli/ssl-setup "$(DESTDIR)$(datadir)/puppetdb/cli/apps/ssl-setup"
+ 	install -m 0755 ext/cli/upgrade "$(DESTDIR)$(datadir)/puppetdb/cli/apps/upgrade"
 -	install -d -m 0755 "$(DESTDIR)$(rundir)"
  
  
diff --git a/databases/puppetdb5/patches/patch-ext_bin_puppetdb b/databases/puppetdb5/patches/patch-ext_bin_puppetdb
index 6648efb2dae..9cee37c1ff5 100644
--- a/databases/puppetdb5/patches/patch-ext_bin_puppetdb
+++ b/databases/puppetdb5/patches/patch-ext_bin_puppetdb
@@ -1,10 +1,10 @@
-$OpenBSD: patch-ext_bin_puppetdb,v 1.1.1.1 2017/11/20 12:47:32 sebastia Exp $
+$OpenBSD: patch-ext_bin_puppetdb,v 1.2 2018/11/12 07:15:56 sebastia Exp $
 Index: ext/bin/puppetdb
 --- ext/bin/puppetdb.orig
 +++ ext/bin/puppetdb
-@@ -12,8 +12,8 @@ elif [ `uname` == "OpenBSD" ] ; then
-     JAVA_BIN=$(javaPathHelper -c puppetdb)
+@@ -13,8 +13,8 @@ elif [ `uname` == "OpenBSD" ] ; then
      JAVA_ARGS="-Xmx192m"
+     TK_ARGS=""
      USER="_puppetdb"
 -    INSTALL_DIR="/opt/puppetlabs/server/apps/puppetdb"
 -    CONFIG="/etc/puppetlabs/puppetdb/conf.d"
diff --git a/databases/puppetdb5/pkg/PLIST-main b/databases/puppetdb5/pkg/PLIST-main
index faac229b3e8..5912cd5fe5c 100644
--- a/databases/puppetdb5/pkg/PLIST-main
+++ b/databases/puppetdb5/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.7 2018/09/04 12:46:10 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.8 2018/11/12 07:15:56 sebastia Exp $
 @option is-branch
 @newgroup _puppetdb:719
 @newuser _puppetdb:719:719:daemon:PuppetDB user:/nonexistent:/sbin/nologin
@@ -35,6 +35,7 @@ share/puppetdb/cli/apps/reload
 share/puppetdb/cli/apps/ssl-setup
 share/puppetdb/cli/apps/start
 share/puppetdb/cli/apps/stop
+share/puppetdb/cli/apps/upgrade
 share/puppetdb/puppetdb.jar
 @owner _puppetdb
 @sample /var/db/puppetlabs/server/data/puppetdb/