diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..450c30c9b5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,12 @@
+default: install
+
+BLACK_FORMAT_CONFIGS = --target-version py37 --line-length 100
+
+install:
+	python setup.py develop
+
+fmt:
+	black $(BLACK_FORMAT_CONFIGS) evennia
+
+lint:
+	black --check $(BLACK_FORMAT_CONFIGS) evennia
diff --git a/requirements.txt b/requirements.txt
index cc23261fa1..cfbf6e5af3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,9 +9,10 @@ inflect
 autobahn >= 17.9.3
 model_mommy
 
-# testing
+# testing and development
 mock >= 1.0.1
 anything
+black
 
 # windows-specific
 pypiwin32;platform_system=="Windows"