diff --git a/requirements-dev.txt b/requirements-dev.txt
index 170f8c1d9..ed3c1c035 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -20,4 +20,4 @@ sphinx-tabs==1.1.13; python_version < '3.6'
 sphinxcontrib-programoutput==0.16
 sphinx-autobuild==2020.9.1; python_version >= '3.6'
 sphinx-autobuild==0.7.1; python_version < '3.6'
-linuxdoc @ git+http://github.com/return42/linuxdoc.git@70673dcf69e705e08d81f53794895dc15c4920b3#egg=linuxdoc
+linuxdoc==20210110
diff --git a/utils/makefile.python b/utils/makefile.python
index 5d0837e00..345434384 100644
--- a/utils/makefile.python
+++ b/utils/makefile.python
@@ -243,8 +243,10 @@ pyenv-python: pyenvinstall
 # [2] https://github.com/pypa/pip/pull/1519
 
 # https://github.com/pypa/twine
-PHONY += upload-pypi
+PHONY += upload-pypi upload-pypi-test
 upload-pypi: pyclean pyenvinstall pybuild
 	@$(PY_ENV_BIN)/twine upload $(PYDIST)/*
 
+upload-pypi-test: pyclean pyenvinstall pybuild
+	@$(PY_ENV_BIN)/twine upload -r testpypi $(PYDIST)/*
 .PHONY: $(PHONY)