diff --git a/Makefile b/Makefile
index 87fcc07a..7bc901c2 100644
--- a/Makefile
+++ b/Makefile
@@ -43,8 +43,7 @@ doctest:
 dist:	clean doctest unittest doc
 	@# Make sure README.rst are consistent
 	cmp -s README.rst buildingspy/README.rst
-	python setup.py sdist --formats=zip
-	python setup.py bdist_egg
+	python setup.py sdist bdist_wheel
 	rm -rf build
 	rm -rf buildingspy.egg-info
 	@echo "Source distribution is in directory dist"
@@ -52,11 +51,17 @@ dist:	clean doctest unittest doc
 	@echo "To upload to PyPi, run 'twine upload dist/*'"
 
 
-
 upload-test:
 	@# Make sure README.rst are consistent
 	cmp -s README.rst buildingspy/README.rst
-	python setup.py sdist --formats=gztar,zip bdist_egg upload -r https://testpypi.python.org/pypi
+	twine upload --repository-url https://test.pypi.org/legacy/ dist/*
+#	python setup.py sdist --formats=gztar,zip bdist_egg upload -r https://testpypi.python.org/pypi
+
+upload:
+	@# Make sure README.rst are consistent
+	cmp -s README.rst buildingspy/README.rst
+	twine upload dist/*
+
 
 clean-dist:
 	rm -rf build