diff --git a/Makefile b/Makefile
index 422837b8..134cb220 100644
--- a/Makefile
+++ b/Makefile
@@ -300,3 +300,7 @@ bump-version:
 	sed -i "s|Release:\(\s*\)[[:digit:]]\+|Release:\11|" osbuild.spec
 	sed -i "s|version=\"$(VERSION)\"|version=\"$(NEXT_VERSION)\"|" setup.py
 	sed -i "s|__version__ = \"$(VERSION)\"|__version__ = \"$(NEXT_VERSION)\"|" osbuild/__init__.py
+
+.PHONY: format
+format:
+	autopep8 --in-place --max-line-length 120 -a -a -a -j0 -r .
diff --git a/tox.ini b/tox.ini
index 54d23a19..4abe591f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,7 +50,7 @@ deps =
     autopep8==2.0.2
 
 commands =
-    bash -c 'python -m autopep8 -r --diff --exit-code {env:LINTABLES}'
+    bash -c 'python -m autopep8 --diff --max-line-length 120 -a -a -a -j0 -r --exit-code {env:LINTABLES}'
 
 [testenv:pylint]
 deps =