diff --git a/content/changelog/v1.1.md b/content/changelog/v1.1.md
index b8e0832d..48934fb3 100644
--- a/content/changelog/v1.1.md
+++ b/content/changelog/v1.1.md
@@ -1,3 +1,6 @@
+---
+date: 1636416000
+---
 <!--
 This is a header file for the generated changelog.
 
diff --git a/content/changelog/v1.2.md b/content/changelog/v1.2.md
index bce9ea66..686d36db 100644
--- a/content/changelog/v1.2.md
+++ b/content/changelog/v1.2.md
@@ -1,3 +1,6 @@
+---
+date: 1643760000
+---
 <!--
 This is a header file for the generated changelog.
 
diff --git a/content/changelog/v1.3.md b/content/changelog/v1.3.md
index eeae95f4..96051f06 100644
--- a/content/changelog/v1.3.md
+++ b/content/changelog/v1.3.md
@@ -1,3 +1,6 @@
+---
+date: 1655247600
+---
 <!--
 This is a header file for the generated changelog.
 
diff --git a/content/changelog/v1.4.md b/content/changelog/v1.4.md
index 2e741e06..f522d405 100644
--- a/content/changelog/v1.4.md
+++ b/content/changelog/v1.4.md
@@ -1,3 +1,6 @@
+---
+date: 1664406000
+---
 <!--
 This is a header file for the generated changelog.
 
diff --git a/layouts/shortcodes/changelog/changelogs.html b/layouts/shortcodes/changelog/changelogs.html
index c4b781d1..78b5932f 100644
--- a/layouts/shortcodes/changelog/changelogs.html
+++ b/layouts/shortcodes/changelog/changelogs.html
@@ -4,7 +4,7 @@
 */}}
 
 {{ with .Page.Resources.Match "*.md" }}
-{{ range ((sort . "Name" "desc")) }}
+{{ range ((sort . "Params.date" "desc")) }}
 {{ .Content }}
 {{ end }}
 {{ end }}
diff --git a/scripts/generate-changelog.sh b/scripts/generate-changelog.sh
index 25fe8c9d..f47ac6d0 100755
--- a/scripts/generate-changelog.sh
+++ b/scripts/generate-changelog.sh
@@ -25,10 +25,15 @@ towncrier --name "Client-Server API" --dir "./client_server" --config "./pyproje
 
 {
     # Prepare the header
-    if [ "$VERSION" = "vUNSTABLE" ]; then
-        cat <<EOF
-## Changes since last release
+    # We include the generation date in the front matter so that we can use it
+    # to sort the changelogs at build time.
+    cat <<EOF
+---
+date: $(date +%s)
+---
 EOF
+    if [ "$VERSION" = "vUNSTABLE" ]; then
+        echo "## Changes since last release"
     else
         sed -e "s/VERSION/$1/g" -e "s/DATE/$2/g" header.md
     fi