diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
index 6428267ab3..b3ad530b3d 100644
--- a/RELEASE-NOTES.md
+++ b/RELEASE-NOTES.md
@@ -1,3 +1,26 @@
+# Version 21.0.1.0
+
+Version 21.0.1 is a minor gem5 release consisting of bug fixes. The 21.0.1 release:
+
+* Fixes the [GCN-GPU Dockerfile](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/util/dockerfiles/gcn-gpu/Dockerfile) to pull from the v21-0 bucket.
+* Fixes the tests to download from the v21-0 bucket instead of the develop bucket.
+* Fixes the Temperature class:
+    * Fixes [fs_power.py](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/configs/example/arm/fs_power.py), which was producing a ["Temperature is not JSON serializable" error](https://gem5.atlassian.net/browse/GEM5-951).
+    * Fixes temperature printing in `config.ini`.
+    * Fixes the pybind export for the `from_kelvin` function.
+* Eliminates a duplicated name warning in [ClockTick](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/src/systemc/channel/sc_clock.cc).
+* Fixes the [Ubuntu 18.04 Dockerfile](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/util/dockerfiles/ubuntu-20.04_all-dependencies/Dockerfile) to use Python3 instead of Python2.
+* Makes [verify.py](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/src/systemc/tests/verify.py) compatible with Python3.
+* Fixes GCN3_X86 builds for aarch64 hosts.
+* Fixes building with `SLICC_HTML=True`.
+* Fixes the [cpt_upgrader.py](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/util/cpt_upgrader.py) string formatter.
+* Fixes typo in [cpy_upgrader.py](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/util/cpt_upgrader.py) where module `errno` was incorrectly put as `ennro`.
+* Sets the `--restore-simpoint-checkpoint` flag default to "False" instead of the ambiguous "None".
+* Fixes a nonsensical check in [MOESI_CMP_token-L1cache](https://gem5.googlesource.com/public/gem5/+/refs/tags/v21.0.1.0/src/mem/ruby/protocol/MOESI_CMP_token-L1cache.sm) which caused compilation bugs in Clang-11.
+* Fixes the `scx_get_parameter_list` for ARM fast models.
+* Fixes [bloated object binaries, known to cause issues during linking](https://gem5.atlassian.net/browse/GEM5-1003).
+* Due to LTO causing unacceptably long link times for some users, and stripping debug symbols in some setups, it is no longer enabled by default. It may be enabled with the `--with-lto` flag. The `--no-lto` flag has been removed.
+
 # Version 21.0.0.0
 
 Version 21.0 marks *one full year* of gem5 releases, and on this anniversary, I think we have some of the biggest new features yet!
diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py
index 1fffab46ff..18bebdd946 100644
--- a/ext/testlib/configuration.py
+++ b/ext/testlib/configuration.py
@@ -213,7 +213,7 @@ def define_defaults(defaults):
                                                       os.pardir,
                                                       os.pardir))
     defaults.result_path = os.path.join(os.getcwd(), 'testing-results')
-    defaults.resource_url = 'http://dist.gem5.org/dist/develop'
+    defaults.resource_url = 'http://dist.gem5.org/dist/v21-0'
     defaults.resource_path = os.path.abspath(os.path.join(defaults.base_dir,
                                             'tests',
                                             'gem5',
diff --git a/src/Doxyfile b/src/Doxyfile
index 9a1093748f..f8b481ec1a 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = gem5
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = DEVELOP-FOR-V21.1
+PROJECT_NUMBER         = v21.0.1.0
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/src/base/version.cc b/src/base/version.cc
index 3f15431c41..4c0bebcc21 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,4 +29,5 @@
 /**
  * @ingroup api_base_utils
  */
-const char *gem5Version = "[DEVELOP-FOR-V21.1]";
+const char *gem5Version = "21.0.1.0";
+
diff --git a/util/dockerfiles/gcn-gpu/Dockerfile b/util/dockerfiles/gcn-gpu/Dockerfile
index e5683ab183..2f5d1b4900 100644
--- a/util/dockerfiles/gcn-gpu/Dockerfile
+++ b/util/dockerfiles/gcn-gpu/Dockerfile
@@ -52,7 +52,7 @@ RUN wget https://bootstrap.pypa.io/get-pip.py -qO get-pip.py
 RUN python3 get-pip.py
 RUN pip install -U setuptools scons==3.1.2 six
 
-ARG gem5_dist=http://dist.gem5.org/dist/develop
+ARG gem5_dist=http://dist.gem5.org/dist/v21-0
 
 # Install ROCm 1.6 binaries
 RUN wget -qO- ${gem5_dist}/apt_1.6.4.tar.bz2 \