diff --git a/doc/manual/release-notes/release-notes.xml b/doc/manual/release-notes/release-notes.xml
index c9bb2e189..4dc94477e 100644
--- a/doc/manual/release-notes/release-notes.xml
+++ b/doc/manual/release-notes/release-notes.xml
@@ -10,34 +10,32 @@
 <para>This section lists the release notes for each stable version of Nix.</para>
 </partintro>
 
-<!-- TODO 
-<xi:include href="rl-18.xml" />
--->
-<xi:include href="rl-17.xml" />
-<xi:include href="rl-161.xml" />
-<xi:include href="rl-16.xml" />
-<xi:include href="rl-152.xml" />
-<xi:include href="rl-15.xml" />
-<xi:include href="rl-14.xml" />
-<xi:include href="rl-13.xml" />
-<xi:include href="rl-12.xml" />
-<xi:include href="rl-11.xml" />
-<xi:include href="rl-10.xml" />
-<xi:include href="rl-016.xml" />
-<xi:include href="rl-015.xml" />
-<xi:include href="rl-014.xml" />
-<xi:include href="rl-013.xml" />
-<xi:include href="rl-012.xml" />
-<xi:include href="rl-011.xml" />
-<xi:include href="rl-0101.xml" />
-<xi:include href="rl-010.xml" />
-<xi:include href="rl-092.xml" />
-<xi:include href="rl-091.xml" />
-<xi:include href="rl-09.xml" />
-<xi:include href="rl-081.xml" />
-<xi:include href="rl-08.xml" />
-<xi:include href="rl-07.xml" />
-<xi:include href="rl-06.xml" />
-<xi:include href="rl-05.xml" />
+<xi:include href="rl-1.8.xml" />
+<xi:include href="rl-1.7.xml" />
+<xi:include href="rl-1.6.1.xml" />
+<xi:include href="rl-1.6.xml" />
+<xi:include href="rl-1.5.2.xml" />
+<xi:include href="rl-1.5.xml" />
+<xi:include href="rl-1.4.xml" />
+<xi:include href="rl-1.3.xml" />
+<xi:include href="rl-1.2.xml" />
+<xi:include href="rl-1.1.xml" />
+<xi:include href="rl-1.0.xml" />
+<xi:include href="rl-0.16.xml" />
+<xi:include href="rl-0.15.xml" />
+<xi:include href="rl-0.14.xml" />
+<xi:include href="rl-0.13.xml" />
+<xi:include href="rl-0.12.xml" />
+<xi:include href="rl-0.11.xml" />
+<xi:include href="rl-0.10.1.xml" />
+<xi:include href="rl-0.10.xml" />
+<xi:include href="rl-0.9.2.xml" />
+<xi:include href="rl-0.9.1.xml" />
+<xi:include href="rl-0.9.xml" />
+<xi:include href="rl-0.8.1.xml" />
+<xi:include href="rl-0.8.xml" />
+<xi:include href="rl-0.7.xml" />
+<xi:include href="rl-0.6.xml" />
+<xi:include href="rl-0.5.xml" />
 
 </part>
diff --git a/doc/manual/release-notes/rl-0101.xml b/doc/manual/release-notes/rl-0.10.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-0101.xml
rename to doc/manual/release-notes/rl-0.10.1.xml
diff --git a/doc/manual/release-notes/rl-010.xml b/doc/manual/release-notes/rl-0.10.xml
similarity index 100%
rename from doc/manual/release-notes/rl-010.xml
rename to doc/manual/release-notes/rl-0.10.xml
diff --git a/doc/manual/release-notes/rl-011.xml b/doc/manual/release-notes/rl-0.11.xml
similarity index 100%
rename from doc/manual/release-notes/rl-011.xml
rename to doc/manual/release-notes/rl-0.11.xml
diff --git a/doc/manual/release-notes/rl-012.xml b/doc/manual/release-notes/rl-0.12.xml
similarity index 100%
rename from doc/manual/release-notes/rl-012.xml
rename to doc/manual/release-notes/rl-0.12.xml
diff --git a/doc/manual/release-notes/rl-013.xml b/doc/manual/release-notes/rl-0.13.xml
similarity index 100%
rename from doc/manual/release-notes/rl-013.xml
rename to doc/manual/release-notes/rl-0.13.xml
diff --git a/doc/manual/release-notes/rl-014.xml b/doc/manual/release-notes/rl-0.14.xml
similarity index 100%
rename from doc/manual/release-notes/rl-014.xml
rename to doc/manual/release-notes/rl-0.14.xml
diff --git a/doc/manual/release-notes/rl-015.xml b/doc/manual/release-notes/rl-0.15.xml
similarity index 100%
rename from doc/manual/release-notes/rl-015.xml
rename to doc/manual/release-notes/rl-0.15.xml
diff --git a/doc/manual/release-notes/rl-016.xml b/doc/manual/release-notes/rl-0.16.xml
similarity index 100%
rename from doc/manual/release-notes/rl-016.xml
rename to doc/manual/release-notes/rl-0.16.xml
diff --git a/doc/manual/release-notes/rl-05.xml b/doc/manual/release-notes/rl-0.5.xml
similarity index 100%
rename from doc/manual/release-notes/rl-05.xml
rename to doc/manual/release-notes/rl-0.5.xml
diff --git a/doc/manual/release-notes/rl-06.xml b/doc/manual/release-notes/rl-0.6.xml
similarity index 100%
rename from doc/manual/release-notes/rl-06.xml
rename to doc/manual/release-notes/rl-0.6.xml
diff --git a/doc/manual/release-notes/rl-07.xml b/doc/manual/release-notes/rl-0.7.xml
similarity index 100%
rename from doc/manual/release-notes/rl-07.xml
rename to doc/manual/release-notes/rl-0.7.xml
diff --git a/doc/manual/release-notes/rl-081.xml b/doc/manual/release-notes/rl-0.8.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-081.xml
rename to doc/manual/release-notes/rl-0.8.1.xml
diff --git a/doc/manual/release-notes/rl-08.xml b/doc/manual/release-notes/rl-0.8.xml
similarity index 100%
rename from doc/manual/release-notes/rl-08.xml
rename to doc/manual/release-notes/rl-0.8.xml
diff --git a/doc/manual/release-notes/rl-091.xml b/doc/manual/release-notes/rl-0.9.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-091.xml
rename to doc/manual/release-notes/rl-0.9.1.xml
diff --git a/doc/manual/release-notes/rl-092.xml b/doc/manual/release-notes/rl-0.9.2.xml
similarity index 100%
rename from doc/manual/release-notes/rl-092.xml
rename to doc/manual/release-notes/rl-0.9.2.xml
diff --git a/doc/manual/release-notes/rl-09.xml b/doc/manual/release-notes/rl-0.9.xml
similarity index 100%
rename from doc/manual/release-notes/rl-09.xml
rename to doc/manual/release-notes/rl-0.9.xml
diff --git a/doc/manual/release-notes/rl-10.xml b/doc/manual/release-notes/rl-1.0.xml
similarity index 100%
rename from doc/manual/release-notes/rl-10.xml
rename to doc/manual/release-notes/rl-1.0.xml
diff --git a/doc/manual/release-notes/rl-11.xml b/doc/manual/release-notes/rl-1.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-11.xml
rename to doc/manual/release-notes/rl-1.1.xml
diff --git a/doc/manual/release-notes/rl-12.xml b/doc/manual/release-notes/rl-1.2.xml
similarity index 100%
rename from doc/manual/release-notes/rl-12.xml
rename to doc/manual/release-notes/rl-1.2.xml
diff --git a/doc/manual/release-notes/rl-13.xml b/doc/manual/release-notes/rl-1.3.xml
similarity index 100%
rename from doc/manual/release-notes/rl-13.xml
rename to doc/manual/release-notes/rl-1.3.xml
diff --git a/doc/manual/release-notes/rl-14.xml b/doc/manual/release-notes/rl-1.4.xml
similarity index 100%
rename from doc/manual/release-notes/rl-14.xml
rename to doc/manual/release-notes/rl-1.4.xml
diff --git a/doc/manual/release-notes/rl-151.xml b/doc/manual/release-notes/rl-1.5.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-151.xml
rename to doc/manual/release-notes/rl-1.5.1.xml
diff --git a/doc/manual/release-notes/rl-152.xml b/doc/manual/release-notes/rl-1.5.2.xml
similarity index 100%
rename from doc/manual/release-notes/rl-152.xml
rename to doc/manual/release-notes/rl-1.5.2.xml
diff --git a/doc/manual/release-notes/rl-15.xml b/doc/manual/release-notes/rl-1.5.xml
similarity index 100%
rename from doc/manual/release-notes/rl-15.xml
rename to doc/manual/release-notes/rl-1.5.xml
diff --git a/doc/manual/release-notes/rl-161.xml b/doc/manual/release-notes/rl-1.6.1.xml
similarity index 100%
rename from doc/manual/release-notes/rl-161.xml
rename to doc/manual/release-notes/rl-1.6.1.xml
diff --git a/doc/manual/release-notes/rl-16.xml b/doc/manual/release-notes/rl-1.6.xml
similarity index 100%
rename from doc/manual/release-notes/rl-16.xml
rename to doc/manual/release-notes/rl-1.6.xml
diff --git a/doc/manual/release-notes/rl-17.xml b/doc/manual/release-notes/rl-1.7.xml
similarity index 100%
rename from doc/manual/release-notes/rl-17.xml
rename to doc/manual/release-notes/rl-1.7.xml
diff --git a/doc/manual/release-notes/rl-18.xml b/doc/manual/release-notes/rl-1.8.xml
similarity index 100%
rename from doc/manual/release-notes/rl-18.xml
rename to doc/manual/release-notes/rl-1.8.xml