diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3badea8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,28 @@
+setup:
+	pip install -r requirements.txt
+
+test:
+	py.test
+
+build:
+	rm -f dist/*
+	python -m build
+
+clean:
+	pip uninstall django-aetos -y
+	rm -f dist/*
+
+install:
+	pip install dist/*.whl
+
+uninstall:
+	pip uninstall django-aetos -y
+
+install-dev:
+	pip install -e .
+
+upload-test:
+	python3 -m twine upload --repository testpypi dist/*.tar.gz dist/*.whl
+
+upload:
+	python3 -m twine upload dist/*.tar.gz dist/*.whl
diff --git a/README.rst b/README.rst
index 467d25b..6eeee8f 100644
--- a/README.rst
+++ b/README.rst
@@ -75,15 +75,22 @@ Dev Setup
 
     python3 -m venv venv
     source venv/bin/activate
-    pip install -r requirements.txt -e .
-    pre-commit install --install-hooks
+    make setup
+    make install-dev
+
+Testing
+---------
+
+.. code-block::
+
+    make test
 
 Packaging
 ---------
 
 .. code-block::
 
-    mkdir -p dist
-    rm -f dist/*
-    python3 -m build
-    python3 -m twine upload --repository testpypi dist/*.tar.gz dist/*.whl
+    make build
+    make upload-test
+
+once the package looks good, run `make upload`.