diff --git a/mail/py-spf-engine/Makefile b/mail/py-spf-engine/Makefile
index c1d7656ebac1..9de01c284770 100644
--- a/mail/py-spf-engine/Makefile
+++ b/mail/py-spf-engine/Makefile
@@ -1,70 +1,67 @@
 # Created by: Giel van Schijndel <me@mortis.eu>
 
 PORTNAME=	spf-engine
-PORTVERSION=	2.9.2
+DISTVERSION=	2.9.3
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yasu@FreeBSD.org
 COMMENT=	SPF engine for Postfix policy server and milter implemented in Python
 
 LICENSE=	APACHE20 GPLv2+
 LICENSE_COMB=	multi
 LICENSE_FILE_APACHE20=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/GPL-2
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>0:mail/py-authres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}milter>0:mail/py-milter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyspf>0:mail/py-pyspf@${PY_FLAVOR}
 
 USES=		python:3.3+ shebangfix
 USE_PYTHON=	autoplist distutils
 USE_RC_SUBR=	pyspf-milter
-NO_ARCH=	yes
+
+SHEBANG_FILES=	spf_engine/milter_spf.py spf_engine/policyd_spf.py
 
 CONFLICTS=	py*-postfix-policyd-spf-python
 
+NO_ARCH=	yes
+SUB_FILES=	pkg-message
+SUB_LIST=	PYSPF_MILTER_RUNDIR=${PYSPF_MILTER_RUNDIR} \
+		PYTHON_CMD=${PYTHON_CMD}
+
 USERS=		pyspf-milter
 GROUPS=		pyspf-milter
 
 PYSPF_MILTER_RUNDIR=	/var/run/pyspf-milter
 
-PLIST_FILES=	'@sample etc/python-policyd-spf/policyd-spf.conf.sample' \
-		'@dir(${USERS},${GROUPS},755) ${PYSPF_MILTER_RUNDIR}'
-
-SHEBANG_FILES=	spf_engine/milter_spf.py \
-		spf_engine/policyd_spf.py
+PLIST_FILES=	'@dir(${USERS},${GROUPS},755) ${PYSPF_MILTER_RUNDIR}' \
+		'@sample etc/python-policyd-spf/policyd-spf.conf.sample'
 
-PORTDOCS=	CHANGES \
-		README \
-		README.per_user_whitelisting \
+PORTDOCS=	CHANGES README README.per_user_whitelisting \
 		policyd-spf.conf.commented
 
-SUB_FILES=	pkg-message
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
-		PYSPF_MILTER_RUNDIR=${PYSPF_MILTER_RUNDIR}
-
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local/etc/|${PREFIX}/etc/|" \
 		${WRKSRC}/spf_engine/milter_spf.py
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 		${WRKSRC}/spf_engine/policyd_spf.py
 	@${REINPLACE_CMD} -e "s|/run|/var/run|" ${WRKSRC}/spf_engine/policydspfsupp.py
 	@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" -e "s|/usr/bin/|${PREFIX}/bin/|" \
 		${WRKSRC}/policyd-spf.1 ${WRKSRC}/policyd-spf.conf.5 \
 		${WRKSRC}/policyd-spf.peruser.5
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pyspf-milter \
 		${STAGEDIR}${PREFIX}/etc/python-policyd-spf
 	${INSTALL_DATA} ${WRKSRC}/policyd-spf.conf \
 		${STAGEDIR}${PREFIX}/etc/python-policyd-spf/policyd-spf.conf.sample
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}/${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/mail/py-spf-engine/distinfo b/mail/py-spf-engine/distinfo
index adb5d33c16f6..00b04979b973 100644
--- a/mail/py-spf-engine/distinfo
+++ b/mail/py-spf-engine/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582568246
-SHA256 (spf-engine-2.9.2.tar.gz) = 188a8bc78f1ddb40f1b87a0b6fe2fa78efa0b4cc5d984ff19a53724bb5c28131
-SIZE (spf-engine-2.9.2.tar.gz) = 52737
+TIMESTAMP = 1644313848
+SHA256 (spf-engine-2.9.3.tar.gz) = c3435bf8bfceb3728f02910da329710956820f816f826be97d5bf00a4b762031
+SIZE (spf-engine-2.9.3.tar.gz) = 52974
diff --git a/mail/py-spf-engine/files/patch-spf__engine_milter__spf.py b/mail/py-spf-engine/files/patch-spf__engine_milter__spf.py
deleted file mode 100644
index cd8c2a41aaef..000000000000
--- a/mail/py-spf-engine/files/patch-spf__engine_milter__spf.py
+++ /dev/null
@@ -1,10 +0,0 @@
---- spf_engine/milter_spf.py.orig	2020-02-26 02:21:41 UTC
-+++ spf_engine/milter_spf.py
-@@ -37,7 +37,6 @@ import spf_engine.policydspfsupp as config
- from spf_engine.util import drop_privileges
- from spf_engine.policydspfsupp import _setExceptHook
- from spf_engine.util import write_pid
--from spf_engine.util import own_socketfile
- from spf_engine.util import fold
- 
- __version__ = "2.9.2"