diff --git a/doc/release-notes/release-notes.adoc b/doc/release-notes/release-notes.adoc
index e89e588fe..0305afada 100644
--- a/doc/release-notes/release-notes.adoc
+++ b/doc/release-notes/release-notes.adoc
@@ -6,7 +6,7 @@ This section lists the release notes for stable versions of Home Manager and the
 
 :leveloffset: 1
 
-include::rl-2103.adoc[]
+include::rl-2105.adoc[]
 
 include::rl-2009.adoc[]
 
diff --git a/doc/release-notes/rl-2103.adoc b/doc/release-notes/rl-2105.adoc
similarity index 92%
rename from doc/release-notes/rl-2103.adoc
rename to doc/release-notes/rl-2105.adoc
index db33e0cfe..0de98fb2b 100644
--- a/doc/release-notes/rl-2103.adoc
+++ b/doc/release-notes/rl-2105.adoc
@@ -1,10 +1,10 @@
-[[sec-release-21.03]]
-== Release 21.03
+[[sec-release-21.05]]
+== Release 21.05
 
 This is the current unstable branch and the information in this
 section is therefore not final.
 
-[[sec-release-21.03-highlights]]
+[[sec-release-21.05-highlights]]
 === Highlights
 
 This release has the following notable changes:
@@ -72,11 +72,11 @@ programs.rofi.extraConfig = {
 };
 ----
 
-[[sec-release-21.03-state-version-changes]]
+[[sec-release-21.05-state-version-changes]]
 === State Version Changes
 
 The state version in this release includes the changes below. These
 changes are only active if the `home.stateVersion` option is set to
-"21.03" or later.
+"21.05" or later.
 
 * Nothing has happened.
diff --git a/home-manager/home-manager b/home-manager/home-manager
index 632198386..fb9f440c4 100644
--- a/home-manager/home-manager
+++ b/home-manager/home-manager
@@ -513,7 +513,7 @@ while [[ $# -gt 0 ]]; do
             export VERBOSE=1
             ;;
         --version)
-            echo 21.03
+            echo 21.05
             exit 0
             ;;
         *)
diff --git a/home-manager/install.nix b/home-manager/install.nix
index 01697eb77..215732556 100644
--- a/home-manager/install.nix
+++ b/home-manager/install.nix
@@ -45,7 +45,7 @@ runCommand "home-manager-install" {
       # You can update Home Manager without changing this value. See
       # the Home Manager release notes for a list of state version
       # changes in each release.
-      home.stateVersion = "21.03";
+      home.stateVersion = "21.05";
     }
     EOF
     fi
diff --git a/modules/misc/version.nix b/modules/misc/version.nix
index 9c742f484..9ba77bd7f 100644
--- a/modules/misc/version.nix
+++ b/modules/misc/version.nix
@@ -5,7 +5,8 @@ with lib;
 {
   options = {
     home.stateVersion = mkOption {
-      type = types.enum [ "18.09" "19.03" "19.09" "20.03" "20.09" "21.03" ];
+      type =
+        types.enum [ "18.09" "19.03" "19.09" "20.03" "20.09" "21.03" "21.05" ];
       default = "18.09";
       description = ''
         It is occasionally necessary for Home Manager to change