diff --git a/Makefile b/Makefile
index 09efad7..4c2d829 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,9 @@ test:
 	tox --skip-missing-interpreters
 
 dist: test
-	python setup.py sdist
+	python setup.py sdist bdist_wheel
 
 release: clean test cleanagain tagv pypi
 
 pypi:
-	python setup.py sdist upload
+	python setup.py sdist bdist_wheel upload --sign
diff --git a/setup.cfg b/setup.cfg
index 24cd053..85128dd 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,3 +35,6 @@ source-dir = docs/source
 [entry_points]
 console_scripts =
     gabbi-run = gabbi.runner:run
+
+[bdist_wheel]
+universal=1