diff --git a/templates/index.html b/templates/index.html
index 9066d90..5a376ac 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -12,7 +12,7 @@
 	<div id="header">
 		{% set current_section = get_section(path="_index.md") %}
 		<a href="{{ config.base_url }}">{{ config.title }}</a>
-		<span class="subtitle">{% block subtitle %}{{ current_section.title }}{% endblock %}</span>
+		<span class="subtitle">{% block subtitle %}{{ config.description }}{% endblock %}</span>
 	</div>
 	<div id="menu">
 		<ul>
diff --git a/templates/section.html b/templates/section.html
index 7d36e58..1f83f01 100644
--- a/templates/section.html
+++ b/templates/section.html
@@ -1,7 +1,11 @@
 {% extends "index.html" %}
 
 {% block subtitle %}
-	{{ section.title }}
+	{% if section.description %}
+		{{ section.description }}
+	{% else %}
+		{{ section.title }}
+	{% endif %}
 {% endblock %}
 
 {% block content %}