diff --git a/blog/content/_index.md b/blog/content/_index.md
index 56b8ab3d..493e0c96 100644
--- a/blog/content/_index.md
+++ b/blog/content/_index.md
@@ -1,3 +1,13 @@
 +++
 template = "edition-2/index.html"
 +++
+
+<h1 style="visibility: hidden; height: 0px; margin: 0px; padding: 0px;">Writing an OS in Rust</h1>
+
+<div class="front-page-introduction">
+
+This blog series creates a small operating system in the [Rust programming language](https://www.rust-lang.org/). Each post is a small tutorial and includes all needed code, so you can follow along if you like. The source code is also available in the corresponding [Github repository](https://github.com/phil-opp/blog_os).
+
+Latest post: <!-- latest-post -->
+
+</div>
diff --git a/blog/templates/edition-2/index.html b/blog/templates/edition-2/index.html
index dbf3762d..4c893f5c 100644
--- a/blog/templates/edition-2/index.html
+++ b/blog/templates/edition-2/index.html
@@ -9,20 +9,10 @@
 {% set posts_section = get_section(path = "edition-2/posts/_index.md") %}
 {% set posts = posts_section.pages %}
 
-<h1 style="visibility: hidden; height: 0px; margin: 0px; padding: 0px;">Writing an OS in Rust</h1>
-
-<div class="front-page-introduction">
-    <p>
-        This blog series creates a small operating system in the
-        <a href="https://www.rust-lang.org/">Rust programming language</a>. Each post is a small tutorial and includes all
-        needed code, so you can follow along if you like. The source code is also available in the corresponding
-        <a href="https://github.com/phil-opp/blog_os">Github repository</a>.
-    </p>
-    <p>Latest post:
-        {% set latest_post = posts|last %}
-        <strong><a href="{{ latest_post.path | safe }}">{{ latest_post.title }}</a></strong>
-    </p>
-</div>
+{{ section.content
+    | replace(from="<!-- latest-post -->", to=macros::latest_post(posts=posts))
+    | safe
+}}
 
 <div>
 {%- set chapter = "none" -%}