diff --git a/mail/py-pyspf/Makefile b/mail/py-pyspf/Makefile
index cdf8ca429d45..48fb26625686 100644
--- a/mail/py-pyspf/Makefile
+++ b/mail/py-pyspf/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	pyspf
 PORTVERSION=	2.0.14
+PORTREVISION=	1
 CATEGORIES=	mail python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	SPF (Sender Policy Framework) implemented in Python
 WWW=		https://github.com/sdgathman/pyspf
 
 LICENSE=	PSFL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:mail/py-authres@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dnspython>=1.16.0,1:dns/py-dnspython@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
 
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
 PLIST_FILES=	bin/spf.py
 
 SHEBANG_FILES=	spf.py
 
 # Make the tests run as a module
 post-patch:
 	@${TOUCH} ${WRKSRC}/test/__init__.py
 
 post-install:
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py
 	${RLN} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py ${STAGEDIR}${PREFIX}/bin/
 
 do-test:
 	cd ${WRKSRC}/ && ${PYTHON_CMD} -m test.testspf
 
 .include <bsd.port.mk>
diff --git a/mail/py-pyspf/files/patch-spf.py b/mail/py-pyspf/files/patch-spf.py
new file mode 100644
index 000000000000..2ce960adfed7
--- /dev/null
+++ b/mail/py-pyspf/files/patch-spf.py
@@ -0,0 +1,11 @@
+--- spf.py.orig	2020-01-01 21:02:26 UTC
++++ spf.py
+@@ -128,7 +128,7 @@ def DNSLookup_dnspython(name, qtype, tcpfallback=True,
+     retVal = []
+     try:
+         # FIXME: how to disable TCP fallback in dnspython if not tcpfallback?
+-        answers = dns.resolver.query(name, qtype, lifetime=timeout)
++        answers = dns.resolver.resolve(name, qtype)
+         for rdata in answers:
+             if qtype == 'A' or qtype == 'AAAA':
+                 retVal.append(((name, qtype), rdata.address))