diff --git a/comms/py-esptool/Makefile b/comms/py-esptool/Makefile
index 79f51c9c64cc..ce68fcad9d76 100644
--- a/comms/py-esptool/Makefile
+++ b/comms/py-esptool/Makefile
@@ -1,40 +1,59 @@
 PORTNAME=	esptool
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.5.1
-PORTREVISION=	2
+DISTVERSION=	3.1
 CATEGORIES=	comms python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
+# Fix running test/test_espefuse_host.py on FreeBSD
+PATCHFILES=	74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch:-p1
+# The wheel package is only required when installing from pip
+PATCHFILES+=	4b14df383c179d9b9bea48c269869e434de878fe.patch:-p1
+
 MAINTAINER=	loader@FreeBSD.org
 COMMENT=	Utility to communicate with Espressif ESP8266 & ESP32 chips
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyserial>=3.0:comms/py-pyserial@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyaes>0:security/py-pyaes@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}ecdsa>0:security/py-ecdsa@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}bitstring>=3.1.6:devel/py-bitstring@${PY_FLAVOR}\
+		${PYTHON_PKGNAMEPREFIX}cryptography>=2.1.4:security/py-cryptography@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}reedsolo>=1.5.3,<=1.5.4:devel/py-reedsolo@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyelftools>0:devel/py-pyelftools@${PY_FLAVOR}
 
 USES=		python:3.6+
 USE_GITHUB=	yes
 USE_PYTHON=	autoplist concurrent distutils
 
 GH_ACCOUNT=	espressif
 NO_ARCH=	yes
 
+# test/test_espefuse_host.py calls the python command
+# through subprocess Popen(), create an alias for it.
+BINARY_ALIAS=		python=${PYTHON_CMD}
+
 ESPTOOL_BAUDRATE?=	115200
 ESPTOOL_CHIP?=		esp8266
 ESPTOOL_SERIALPORT?=	/dev/ttyU0
 
 do-test:
-	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest \
-		--ignore test/test_esptool.py
+	@cd ${TEST_WRKSRC} && for test in \
+		test/test_imagegen.py \
+		test/test_espsecure.py \
+		test/test_merge_bin.py \
+		test/test_modules.py; \
+		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} $${test}; done
+	@cd ${TEST_WRKSRC} && for chip in \
+		esp32 esp32s2 esp32s3beta2 esp32s3beta3 esp32c3; \
+		do ${SETENV} ${TEST_ENV} ${PYTHON_CMD} \
+		test/test_espefuse_host.py $${chip}; done
 .if exists(${ESPTOOL_SERIALPORT})
 	@cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} \
+		PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} \
 		${PYTHON_CMD} test/test_esptool.py \
 		${ESPTOOL_SERIALPORT} ${ESPTOOL_CHIP} ${ESPTOOL_BAUDRATE}
 .endif
 
 .include <bsd.port.mk>
diff --git a/comms/py-esptool/distinfo b/comms/py-esptool/distinfo
index 8c0043f90422..39281ef7e9fa 100644
--- a/comms/py-esptool/distinfo
+++ b/comms/py-esptool/distinfo
@@ -1,3 +1,7 @@
-TIMESTAMP = 1545284851
-SHA256 (espressif-esptool-v2.5.1_GH0.tar.gz) = 6730b69d8ba09ff09f845873eaeef352bd18a4ee24b31b0898fd8fc5f178c037
-SIZE (espressif-esptool-v2.5.1_GH0.tar.gz) = 4042666
+TIMESTAMP = 1634543623
+SHA256 (espressif-esptool-v3.1_GH0.tar.gz) = 5edc768a63df4d73bdeba534146f6b3e41fbbe3c25f08be627733fc38535a976
+SIZE (espressif-esptool-v3.1_GH0.tar.gz) = 6897273
+SHA256 (74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch) = fe02a173c314956eea1f8a838659f8782d887754fe7f69ff2e0926b5bc2bfd2f
+SIZE (74c55a8ffce4347a11479b07d50ccca33e0c0b8d.patch) = 2014
+SHA256 (4b14df383c179d9b9bea48c269869e434de878fe.patch) = 7ab9ccd35d44f597c327f446830958558d38bd2d8744e14839a82062a73da217
+SIZE (4b14df383c179d9b9bea48c269869e434de878fe.patch) = 1087