diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 3514845816c4..6496b880ea85 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,45 +1,45 @@
 PORTNAME=	gdbm
 DISTVERSION=	${PYTHON_DISTVERSION}
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	databases python
 MASTER_SITES=	PYTHON/ftp/python/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Python-${DISTVERSION}
 DIST_SUBDIR=	python
 
 MAINTAINER=	python@FreeBSD.org
 COMMENT=	Python bindings to the GNU dbm library (Python ${PYTHON_VER})
 
 LICENSE=	PSFL
 LICENSE_FILE=	${WRKDIR}/Python-${DISTVERSION}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>0:devel/py-setuptools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR}
 LIB_DEPENDS=	libgdbm.so:databases/gdbm
 
 USES=		compiler:c11 python tar:xz
 USE_PYTHON=	allflavors autoplist pep517
 
 DISTINFO_FILE=	${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo
 WRKSRC_SUBDIR=	Modules
 
 SUB_LIST+=	DISTVERSION=${DISTVERSION}
 SUB_FILES=	pyproject.toml
 PLIST_FILES=	${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;}/lib-dynload/_gdbm${PYTHON_EXT_SUFFIX}.so
 
 PORTSCOUT=	ignore:1
 
 pre-configure:
 	@${CP} ${FILESDIR}/setup.py ${WRKSRC}
 	@${MV} ${WRKDIR}/pyproject.toml ${WRKSRC}
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_gdbm${PYTHON_EXT_SUFFIX}.so
 	# lib-dynload is the expected location
 	@${MKDIR} ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload
 	@(cd ${STAGEDIR}${PYTHONPREFIX_LIBDIR}/lib-dynload && ${LN} -s ../site-packages/_gdbm${PYTHON_EXT_SUFFIX}.so)
 
 do-test:
 	@${PYTHON_CMD} -c 'import dbm'  # minimal smoke test
 
 .include <bsd.port.mk>
diff --git a/databases/py-gdbm/files/setup.py b/databases/py-gdbm/files/setup.py
index d6424297d8da..57804f9db8e7 100644
--- a/databases/py-gdbm/files/setup.py
+++ b/databases/py-gdbm/files/setup.py
@@ -1,15 +1,18 @@
 #!/usr/bin/env python
 
 import sysconfig
 from setuptools import setup, Extension
 
 prefix = sysconfig.get_config_var('prefix')
-inc_dirs = [prefix + "/include"]
+inc_dirs = [sysconfig.get_path('include') + "/internal",
+            prefix + "/include"]
 lib_dirs = [prefix + "/lib"]
 libs = ["gdbm"]
+macros = [('Py_BUILD_CORE_MODULE', 1)]
 
 setup(ext_modules = [Extension('_gdbm', ['_gdbmmodule.c'],
                                include_dirs = inc_dirs,
                                libraries = libs,
-                               library_dirs = lib_dirs)]
+                               library_dirs = lib_dirs,
+                               define_macros = macros)]
       )