diff --git a/devel/py-bitstring/Makefile b/devel/py-bitstring/Makefile
index 88003ba79441..7d540e84f69a 100644
--- a/devel/py-bitstring/Makefile
+++ b/devel/py-bitstring/Makefile
@@ -1,30 +1,34 @@
 PORTNAME=	bitstring
-PORTVERSION=	3.1.9
+PORTVERSION=	4.1.0
 CATEGORIES=	devel python
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sbz@FreeBSD.org
 COMMENT=	Simple construction, analysis, and modification of binary data
 WWW=		https://pypi.org/project/bitstring/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USE_PYTHON=	autoplist concurrent pep517
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
-PORTDOCS=	PKG-INFO README.rst release_notes.txt
+PORTDOCS=	PKG-INFO README.md release_notes.txt
+
+BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR}
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}bitarray>=0:devel/py-bitarray@${PY_FLAVOR}
 
 OPTIONS_DEFINE=	DOCS
 NO_ARCH=	yes
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 do-test:
-	@(cd ${WRKSRC}/test && ${PYTHON_CMD} -c 'import unittest, test_${PORTNAME}; unittest.main(test_${PORTNAME})')
+	@(cd ${WRKSRC}/tests && ${PYTHON_CMD} -c 'import unittest, test_${PORTNAME}; unittest.main(test_${PORTNAME})')
 
 .include <bsd.port.mk>
diff --git a/devel/py-bitstring/distinfo b/devel/py-bitstring/distinfo
index 79956c79c8ab..53f8c39efe40 100644
--- a/devel/py-bitstring/distinfo
+++ b/devel/py-bitstring/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1633119537
-SHA256 (bitstring-3.1.9.tar.gz) = a5848a3f63111785224dca8bb4c0a75b62ecdef56a042c8d6be74b16f7e860e7
-SIZE (bitstring-3.1.9.tar.gz) = 198509
+TIMESTAMP = 1719264861
+SHA256 (bitstring-4.1.0.tar.gz) = b1672fb31721dbb6c809e76a3a19ac76a608e1f8fcacce9349ae2b72b1917b20
+SIZE (bitstring-4.1.0.tar.gz) = 227045