diff --git a/flaskr/__init__.py b/flaskr/__init__.py
index b92e3fe4..38d703d3 100644
--- a/flaskr/__init__.py
+++ b/flaskr/__init__.py
@@ -1,6 +1,7 @@
 import os
 
 from flask import Flask, request, g
+import markdown
 
 
 def create_app(test_config=None):
diff --git a/flaskr/blog.py b/flaskr/blog.py
index be0d92c4..9ae4adaf 100644
--- a/flaskr/blog.py
+++ b/flaskr/blog.py
@@ -6,6 +6,7 @@ from flask import render_template
 from flask import request
 from flask import url_for
 from werkzeug.exceptions import abort
+import markdown
 
 from .auth import login_required
 from .db import get_db
@@ -22,6 +23,9 @@ def index():
         " FROM post p JOIN user u ON p.author_id = u.id"
         " ORDER BY created DESC"
     ).fetchall()
+    # Convert markdown to HTML for each post body
+    for post in posts:
+        post['body'] = markdown.markdown(post['body'])
     return render_template("blog/index.html", posts=posts)
 
 
diff --git a/flaskr/templates/blog/create.html b/flaskr/templates/blog/create.html
index 88e31e44..d4af7262 100644
--- a/flaskr/templates/blog/create.html
+++ b/flaskr/templates/blog/create.html
@@ -8,7 +8,7 @@
   <form method="post">
     <label for="title">Title</label>
     <input name="title" id="title" value="{{ request.form['title'] }}" required>
-    <label for="body">Body</label>
+    <label for="body">Body (Markdown supported)</label>
     <textarea name="body" id="body">{{ request.form['body'] }}</textarea>
     <input type="submit" value="Save">
   </form>
diff --git a/flaskr/templates/blog/index.html b/flaskr/templates/blog/index.html
index 4658b876..d10466dc 100644
--- a/flaskr/templates/blog/index.html
+++ b/flaskr/templates/blog/index.html
@@ -19,7 +19,7 @@
           <a class="action" href="{{ url_for('blog.update', id=post['id']) }}">Edit</a>
         {% endif %}
       </header>
-      <p class="body">{{ post['body'] }}</p>
+      <p class="body">{{ post['body']|safe }}</p>
     </article>
     {% if not loop.last %}
       <hr>
diff --git a/flaskr/templates/blog/update.html b/flaskr/templates/blog/update.html
index 2c405e63..5c940aa3 100644
--- a/flaskr/templates/blog/update.html
+++ b/flaskr/templates/blog/update.html
@@ -8,7 +8,7 @@
   <form method="post">
     <label for="title">Title</label>
     <input name="title" id="title" value="{{ request.form['title'] or post['title'] }}" required>
-    <label for="body">Body</label>
+    <label for="body">Body (Markdown supported)</label>
     <textarea name="body" id="body">{{ request.form['body'] or post['body'] }}</textarea>
     <input type="submit" value="Save">
   </form>