diff --git a/devel/py-bitarray/Makefile b/devel/py-bitarray/Makefile
index 051bb24aa137..a13d84c4282a 100644
--- a/devel/py-bitarray/Makefile
+++ b/devel/py-bitarray/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2023/02/13 10:44:14 adam Exp $
+# $NetBSD: Makefile,v 1.25 2023/02/20 08:47:33 wiz Exp $
 
 DISTNAME=	bitarray-2.7.2
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
@@ -10,6 +10,15 @@ HOMEPAGE=	https://github.com/ilanschnell/bitarray
 COMMENT=	Efficient arrays of booleans
 LICENSE=	python-software-foundation
 
+# https://github.com/ilanschnell/bitarray/issues/189
+SUBST_CLASSES+=		pop
+SUBST_SED.pop+=		-e 's,popcount,my_popcount,'
+SUBST_FILES.pop+=	bitarray/_bitarray.c
+SUBST_FILES.pop+=	bitarray/_util.c
+SUBST_FILES.pop+=	bitarray/bitarray.h
+SUBST_MESSAGE.pop=	Fix conflict with NetBSD's popcount.
+SUBST_STAGE.pop=	pre-configure
+
 do-test:
 	${PYTHONBIN} -c 'import bitarray; bitarray.test()'