diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0e1437..9678ca2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
-# Release 20.09 (unreleased)
+# Changelog
 
-## State version changes:
+## Release 21.05 (unreleased)
+
+### New Options
+
+* The `/etc/nix/nix.conf` file is now fully configurable with the
+  new options `nix.*`.
+
+## Release 20.09
+
+### State version changes
 
 These changes are only active
 if the `system.stateVersion` option is set to `"20.09"` or later.
@@ -8,18 +17,18 @@ if the `system.stateVersion` option is set to `"20.09"` or later.
 * `home-manager.useUserPackages` now defaults to `true`.
   The developers are not aware of any adverse effects so far.
 
-## Other compatibility considerations:
+### Other compatibility considerations
 
 * Pre-module-system installations are not supported anymore with this release.
   If you are not on `release-19.09` yet,
   either or attempt an upgrade to `release-19.09`
   and follow the instructions, or backup and reinstall (preferred).
 
-## Nix flakes support
+### Nix flakes support
 
 * A `flake.nix` file was added.
 
-## Known issues:
+### Known issues
 
 * If `make` fails on your device with `Function not implemented`,
   report that in https://github.com/t184256/nix-on-droid/issues/91