diff --git a/Makefile b/Makefile
index 814be635..e2aed991 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,9 @@ bootstrap: $(VENV)/bin/pip
 	$(VENV)/bin/pip install -e .[dev]
 
 format:
-	$(VENV)/bin/black .
+	$(VENV)/bin/codespell
+	$(VENV)/bin/ruff check
+	$(VENV)/bin/ruff format
 
 doc: $(VENV)/bin/sphinx-build
 	. $(ACTIVATE);
diff --git a/pyproject.toml b/pyproject.toml
index b600b34d..6b224d25 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,15 +50,16 @@ redis = ["redis>=2.10.5"]
 dev = [
     "CacheControl[filecache,redis]",
     "build",
+    "cherrypy",
+    "codespell[tomli]",
+    "furo",
     "mypy",
-    "tox",
-    "pytest-cov",
     "pytest",
-    "cherrypy",
+    "pytest-cov",
+    "ruff",
     "sphinx",
-    "furo",
     "sphinx-copybutton",
-    "black",
+    "tox",
     "types-redis",
     "types-requests",
 ]
@@ -77,3 +78,6 @@ ignore_missing_imports = true
 
 [tool.pytest.ini_options]
 norecursedirs = ["bin", "lib", "include", "build"]
+
+[tool.ruff]
+target-version = "py38"