diff --git a/.gitignore b/.gitignore
index 2c8f1d5..9a6ace2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /*.txt
 /tests/format-support-*/
 /tests/fixtures/tmp_*
+/dist-env/
 
 __pycache__/
 *.py[cod]
diff --git a/Makefile b/Makefile
index a6f18ea..4d99458 100644
--- a/Makefile
+++ b/Makefile
@@ -19,12 +19,22 @@ uninstall:
 test:
 	python3 tests/test_icnsutil.py
 
+dist-env:
+	@echo Creating virtual environment...
+	@python3 -m venv 'dist-env'
+	@source dist-env/bin/activate && pip install twine
+
 .PHONY: dist
-dist:
-	@python3 setup.py sdist --formats=tar bdist_wheel \
-	|| echo '-> you can not do this inside a virtual environment.'
+dist: dist-env
+	[ -z "$${VIRTUAL_ENV}" ]  # you can not do this inside a virtual environment.
+	rm -rf dist
+	@echo Building...
+	python3 setup.py sdist bdist_wheel
 	@echo
 	rm -rf ./*.egg-info/ ./build/ MANIFEST
+	@echo Publishing...
+	@echo "\033[0;31mEnter your PyPI token:\033[0m"
+	@source dist-env/bin/activate && export TWINE_USERNAME='__token__' && twine upload dist/*
 
 _icns_list.txt:
 	@echo 'Generate list of system icns files...'
diff --git a/README.md b/README.md
index f5478e5..11d42e2 100644
--- a/README.md
+++ b/README.md
@@ -117,7 +117,10 @@ Note: the CLI `export` command will fail if you run `--convert` without Pillow.
 ## Help needed
 
 1. Do you have an old macOS version running somewhere?  
-You can help and identify what file formats / icns types were introduced and when. Download the [format-support-icns.zip](./tests/format-support-icns.zip) file and report back which icons are displayed properly and in which macOS version.  
+You can help and identify what file formats / icns types were introduced and when. Download the [format-support-icns.zip] file and report back which icons are displayed properly and in which macOS version.  
 See the [Apple Icon Image](https://en.wikipedia.org/wiki/Apple_Icon_Image) wikipedia article.
 
 2. You can run `make sys-icons-test` and report back whether you find some weird icons that are not handled properly by this library.
+
+[format-support-icns.zip]: https://github.com/relikd/icnsutil/raw/main/tests/format-support-icns.zip
+