diff --git a/CHANGELOG b/CHANGELOG
index 5a67665..0845a3d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,13 @@
 Changelog
 =========
 
-0.21 (unreleased)
+0.22 (unreleased)
+-----------------
+
+- Nothing changed yet.
+
+
+0.21 (2018-09-20)
 -----------------
 
 - Migrate GitHub organization
diff --git a/Makefile b/Makefile
index 5fc5a8c..bb0a65b 100644
--- a/Makefile
+++ b/Makefile
@@ -15,5 +15,21 @@ docs: bin/sphinx-build
 	bin/pip install sphinx
 	SPHINXBUILD=../bin/sphinx-build $(MAKE) -C docs html $^
 
+#: clean - Basic cleanup, mostly temporary files.
 clean:
-	rm -rf bin .tox include/ lib/ man/ django_mail_factory.egg-info/ build/ pip-selfcheck.json
+	find . -name '*.pyc' -delete
+	find . -name '*.pyo' -delete
+	find . -name __pycache__ -delete
+
+
+#: distclean - Remove local builds, such as *.egg-info.
+distclean: clean
+	rm -rf *.egg
+	rm -rf *.egg-info
+
+
+#: maintainer-clean - Remove almost everything that can be re-generated.
+maintainer-clean: distclean
+	rm -rf build/
+	rm -rf dist/
+	rm -rf .tox/
diff --git a/VERSION b/VERSION
index a8d3008..779b9a7 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.21.dev0
+0.22.dev0