diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes17.rst
rename from libcxx/docs/ReleaseNotes.rst
rename to libcxx/docs/ReleaseNotes17.rst
diff --git a/libcxx/docs/ReleaseProcedure.rst b/libcxx/docs/ReleaseProcedure.rst
--- a/libcxx/docs/ReleaseProcedure.rst
+++ b/libcxx/docs/ReleaseProcedure.rst
@@ -16,7 +16,7 @@
 It should be finished before the Release managers start branching the new
 release:
 
-* Make sure the ``libcxx/docs/ReleaseNotes.rst`` is up to date. Typically
+* Make sure the ``libcxx/docs/ReleaseNotes<VERSION>.rst`` is up to date. Typically
   this file is updated when contributing patches. Still there might be some
   information added regarding the general improvements of larger projects.
 
@@ -48,7 +48,8 @@
 2. Update the version number in ``libcxx/docs/conf.py``
 3. Update ``_LIBCPPABI_VERSION`` in ``libcxxabi/include/cxxabi.h``
 4. Update ``_LIBUNWIND_VERSION`` in ``libunwind/include/__libunwind_config.h``
-5. Remove the in-progress warning from ``libcxx/docs/ReleaseNotes.rst``
+5. Create a release notes file for the next release from the one for the previous release
+6. Point to the new release notes file from ``libcxx/docs/index.rst``
 
 Post branching
 ==============
diff --git a/libcxx/docs/index.rst b/libcxx/docs/index.rst
--- a/libcxx/docs/index.rst
+++ b/libcxx/docs/index.rst
@@ -34,7 +34,7 @@
 .. toctree::
    :maxdepth: 1
 
-   ReleaseNotes
+   ReleaseNotes17
    UsingLibcxx
    BuildingLibcxx
    TestingLibcxx