diff --git a/devel/py-p4python/Makefile b/devel/py-p4python/Makefile
index 65fa6c8af96c..73f0f3160f54 100644
--- a/devel/py-p4python/Makefile
+++ b/devel/py-p4python/Makefile
@@ -1,27 +1,27 @@
 PORTNAME=	p4python
 PORTVERSION=	2016.1.1447008
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	antonfb@hesiod.org
 COMMENT=	Python bindings for the Perforce API
 WWW=		https://www.perforce.com/perforce/r14.2/manuals/p4script/python.programming.html
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BROKEN_riscv64=		fails to build: TypeError: can only concatenate str (not "NoneType") to str
 
 BUILD_DEPENDS+=	${LOCALBASE}/lib/perforce/libclient.a:devel/p4api
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		dos2unix python:3.6+ ssl
 USE_PYTHON=	distutils autoplist
 PYDISTUTILS_BUILDARGS=	--ssl ${OPENSSLLIB}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's:%%LOCALBASE%%:${LOCALBASE}:' ${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/devel/py-p4python/files/patch-P4PythonDebug.cpp b/devel/py-p4python/files/patch-P4PythonDebug.cpp
new file mode 100644
index 000000000000..9509bb0aaa24
--- /dev/null
+++ b/devel/py-p4python/files/patch-P4PythonDebug.cpp
@@ -0,0 +1,10 @@
+--- P4PythonDebug.cpp.orig	2023-04-01 20:37:16 UTC
++++ P4PythonDebug.cpp
+@@ -29,6 +29,7 @@ $Id$
+ #include <Python.h>
+ #include <iostream>
+ 
++#include <stdhdrs.h>
+ #include <debug.h>
+ 
+ #include "P4PythonDebug.h"