diff --git a/contrib/pyln-proto/Makefile b/contrib/pyln-proto/Makefile
index 6cd09e987..c111cd6ef 100644
--- a/contrib/pyln-proto/Makefile
+++ b/contrib/pyln-proto/Makefile
@@ -1,5 +1,12 @@
 #! /usr/bin/make
 
+.PHONY: bdist sdist release check check-source check-flake8 check-mypy
+VERSION = $(shell python3 -c 'from pyln import proto;print(proto.__version__)')
+
+SDIST_FILE = "dist/pyln-proto-$(VERSION).tar.gz"
+BDIST_FILE = "dist/pyln_proto-$(VERSION)-py3-none-any.whl"
+ARTEFACTS = $(BDIST_FILE) $(SDIST_FILE)
+
 check:
 	pytest
 
@@ -11,3 +18,29 @@ check-flake8:
 # mypy . does not recurse.  I have no idea why...
 check-mypy:
 	mypy --ignore-missing-imports `find * -name '*.py'`
+
+$(SDIST_FILE):
+	python3 setup.py sdist
+
+$(BDIST_FILE):
+	python3 setup.py bdist
+
+test-release: check $(ARTEFACTS)
+	python3 -m twine upload --repository testpypi --skip-existing $(ARTEFACTS)
+
+	# Create a test virtualenv, install from the testpypi and run the
+	# tests against it (make sure not to use any virtualenv that may have
+	# pyln-proto already installed).
+	virtualenv --no-site-packages testpypi --python=/usr/bin/python3 --download --always-copy --clear
+	# Install the requirements from the prod repo, they are not being kept up to date on the test repo
+	testpypi/bin/python3 -m pip install -r requirements.txt pytest flaky pytest-timeout
+	testpypi/bin/python3 -m pip install -I --index-url https://test.pypi.org/simple/ --no-deps pyln-proto
+	testpypi/bin/python3 -c "from pyln import proto;assert(proto.__version__ == '$(VERSION)')"
+	testpypi/bin/pytest tests
+	rm -rf testpypi
+
+prod-release: test $(ARTEFACTS)
+	python3 -m twine upload $(ARTEFACTS)
+
+clean:
+	rm -rf testpypi