diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 1b504d34c708..730f03a15dec 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -209,7 +209,7 @@ jobs:
         TWINE_USERNAME: ${{ secrets.pypi_username }}
         TWINE_PASSWORD: ${{ secrets.pypi_password }}
       run: |
-        # setup.py sdist was run by 'make stubs'
+        # python -m build was run by 'make stubs'
         [ -z "$TWINE_USERNAME" ] || echo "Uploading dev release to PyPi"
         [ -z "$TWINE_USERNAME" ] || twine upload circuitpython-stubs/dist/*
 
diff --git a/Makefile b/Makefile
index d611dff49db9..05d361865870 100644
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,7 @@ stubs:
 	@cp setup.py-stubs circuitpython-stubs/setup.py
 	@cp README.rst-stubs circuitpython-stubs/README.rst
 	@cp MANIFEST.in-stubs circuitpython-stubs/MANIFEST.in
-	@(cd circuitpython-stubs && $(PYTHON) setup.py -q sdist)
+	@$(PYTHON) -m build circuitpython-stubs
 
 .PHONY: check-stubs
 check-stubs: stubs
diff --git a/requirements-doc.txt b/requirements-doc.txt
index 0489dc0b9f29..15df3b13780d 100644
--- a/requirements-doc.txt
+++ b/requirements-doc.txt
@@ -3,6 +3,7 @@ mypy
 black
 isort
 twine
+build
 wheel
 astroid
 setuptools>=45
diff --git a/tools/test-stubs.sh b/tools/test-stubs.sh
index 6c6c99101586..f4169f5de95c 100755
--- a/tools/test-stubs.sh
+++ b/tools/test-stubs.sh
@@ -2,7 +2,7 @@
 rm -rf test-stubs
 python3 -m venv test-stubs
 . test-stubs/bin/activate
-pip install mypy isort black adafruit-circuitpython-typing wheel
+pip install mypy isort black adafruit-circuitpython-typing wheel build
 rm -rf circuitpython-stubs .mypy_cache
 make stubs
 pip install --force-reinstall circuitpython-stubs/dist/circuitpython-stubs-*.tar.gz