diff --git a/databases/py-puppetdb/Makefile b/databases/py-puppetdb/Makefile
index f739adb842e..d85f4b539e7 100644
--- a/databases/py-puppetdb/Makefile
+++ b/databases/py-puppetdb/Makefile
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.23 2020/07/03 21:12:37 sthen Exp $
+# $OpenBSD: Makefile,v 1.24 2021/03/14 13:10:13 sebastia Exp $
 
 COMMENT=		library for working with the PuppetDB API
 
-MODPY_EGG_VERSION=	2.2.0
+MODPY_EGG_VERSION=	2.3.0
 DISTNAME=		pypuppetdb-${MODPY_EGG_VERSION}
 PKGNAME=		py-puppetdb-${MODPY_EGG_VERSION}
 CATEGORIES=		databases www
-REVISION=		0
 
 MAINTAINER=		Sebastian Reitenbach <sebastia@openbsd.org>
 
@@ -19,13 +18,16 @@ MODPY_SETUPTOOLS=	Yes
 MODPY_PI =		Yes
 
 FLAVORS =		python3
-FLAVOR?=
+FLAVOR?=		python3
 
-RUN_DEPENDS=		www/py-requests${MODPY_FLAVOR}>=2.22.0 \
-			devel/py-six${MODPY_FLAVOR}>=1.13.0
+RUN_DEPENDS=		www/py-requests${MODPY_FLAVOR}>=2.22.0
 BUILD_DEPENDS=		${RUN_DEPENDS}
 
 # ERROR: toxini file 'tox.ini' not found
 NO_TEST =		Yes
 
+# The file doesn't exist, but setup tries to open it and fails
+pre-build:
+	touch ${WRKDIST}/CHANGELOG.md
+
 .include <bsd.port.mk>
diff --git a/databases/py-puppetdb/distinfo b/databases/py-puppetdb/distinfo
index 812512a1347..449604afd76 100644
--- a/databases/py-puppetdb/distinfo
+++ b/databases/py-puppetdb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pypuppetdb-2.2.0.tar.gz) = usAib+VOTXuVi3AfNKrRpjpx+2VQP+9mIVykVKCxjyE=
-SIZE (pypuppetdb-2.2.0.tar.gz) = 45715
+SHA256 (pypuppetdb-2.3.0.tar.gz) = 2dtXNcWLmznf5rhjSvRr77tbMxbBGmVFkZrO2dz+iXM=
+SIZE (pypuppetdb-2.3.0.tar.gz) = 36084
diff --git a/databases/py-puppetdb/pkg/PLIST b/databases/py-puppetdb/pkg/PLIST
index d46441c2896..0419862bc7c 100644
--- a/databases/py-puppetdb/pkg/PLIST
+++ b/databases/py-puppetdb/pkg/PLIST
@@ -1,11 +1,11 @@
-@comment $OpenBSD: PLIST,v 1.7 2019/09/26 10:15:56 sebastia Exp $
+@comment $OpenBSD: PLIST,v 1.8 2021/03/14 13:10:13 sebastia Exp $
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}rc0-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/pypuppetdb-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/QueryBuilder.py
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}/
@@ -13,12 +13,10 @@ lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}QueryBuilder
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}package.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/api.py
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/errors.py
-lib/python${MODPY_VERSION}/site-packages/pypuppetdb/package.py
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/types.py
 lib/python${MODPY_VERSION}/site-packages/pypuppetdb/utils.py
 @comment requirements_for_tests/