diff --git a/source/_layouts/post.html.twig b/source/_layouts/post.html.twig
index 4e311670..6c6439f8 100644
--- a/source/_layouts/post.html.twig
+++ b/source/_layouts/post.html.twig
@@ -24,6 +24,10 @@
     {% include 'post/header' %}
     {% include 'post/intro-image' %}
 
+    {% if page.excerpt %}
+        {{ page.excerpt|markdown }}
+    {% endif %}
+
     {% block content %}{% endblock %}
 
     {% include 'post/twitter-link' %}
diff --git a/source/blog.html b/source/blog.html
index 6d372305..816f8857 100644
--- a/source/blog.html
+++ b/source/blog.html
@@ -19,12 +19,10 @@ use: [posts]
 
                 {% include 'post/intro-image' with { page: post } %}
 
-                {% if post.blocks.excerpt %}
-                    {{ post.blocks.excerpt|raw }}
-                {% elseif '<!-- split -->' in post.blocks.content %}
-                    {{ post.blocks.content|split('<!-- split -->')|first|raw }}
+                {% if post.excerpt %}
+                    {{ post.excerpt|markdown }}
                 {% else %}
-                    <p>{{ post.blocks.content|raw|striptags|split(' ')|slice(0,50)|join(' ')|replace({ 'h2': 'h3' }) }} &hellip;</p>
+                    {{ post.blocks.content|split('\n\n')|first|raw }}
                 {% endif %}
 
                 <p><a href="{{ post.url }}">Read more &rarr;</a></p>