diff --git a/Makefile b/Makefile
index 0459702..18e4c9a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,21 @@
-default : clean dist
+.PHONY: clean publish test
 
 dist :
-	@echo "\nMaking source"
-	@echo "-------------"
-	@python setup.py sdist
+	python setup.py sdist --formats=gztar,zip
+	python setup.py bdist_wheel --python-tag=py3
 
-	@echo "\nMaking wheel"
-	@echo "-------------"
-	@python setup.py bdist_wheel --universal
-
-	@echo "\nDone."
-
-clean :
-	find . -name "*pyc" | xargs rm -rf $1
-	rm -rf build dist MANIFEST htmlcov deb_dist toot*.tar.gz
+deb_dist:
+	python setup.py --command-packages=stdeb.command bdist_deb
 
 publish :
 	twine upload dist/*
 
+test:
+	pytest -v -s
+
 coverage:
 	py.test --cov=toot --cov-report html tests/
 
-deb:
-	@python setup.py --command-packages=stdeb.command bdist_deb
-
-test:
-	pytest -v -s
+clean :
+	find . -name "*pyc" | xargs rm -rf $1
+	rm -rf build dist MANIFEST htmlcov deb_dist toot*.tar.gz
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 330763d..e532287 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -1,5 +1,7 @@
-pytest-cov~=2.4.0
-pytest~=3.0.0
-stdeb~=0.8.5
-twine~=1.8.1
-wheel~=0.29.0
+keyring
+pytest
+pytest-cov
+pyxdg
+stdeb
+twine
+wheel
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index 3c6e79c..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[bdist_wheel]
-universal=1