diff --git a/Makefile b/Makefile
index 5cccba2..2aa9a8e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,4 @@ kit:
 	$(SDIST_CMD)
 
 kit_upload:
-	$(SDIST_CMD) upload
-
-pypi:
-	python setup.py register
+	twine upload dist/*
diff --git a/howto.txt b/howto.txt
index e3163e6..e9dace7 100644
--- a/howto.txt
+++ b/howto.txt
@@ -6,5 +6,4 @@
 - Update README.rst with latest changes
 - Kits:
     $ make kit
-    $ make pypi
     $ make kit_upload
diff --git a/requirements.txt b/requirements.txt
index 8b004f0..1b68e9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
 # To run tests, we just need tox.
 tox >= 1.8
+twine