2 files changed, 26 insertions, 22 deletions
diff --git a/themes/classic/source/_includes/article.html b/themes/classic/source/_includes/article.html
index 92c06024..764e36d1 100644
--- a/themes/classic/source/_includes/article.html
+++ b/themes/classic/source/_includes/article.html
@@ -3,24 +3,26 @@
 {% else %}
   {% assign author = site.author %}
 {% endif %}
-<header>
-  {% if index %}
-    <h1 class="entry-title"><a href="{{ page.url }}">{{ page.title | titlecase }}</a></h1>
-  {% else %}
-    <h1 class="entry-title">{{ page.title | titlecase }}</h1>
-  {% endif %}
-  {% unless page.nometa %}
-    <p>
-      {% if page.date %}
-        <time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
-      {% endif %}
-      {% if page.updated %}
-        <time class="updated" datetime="{{ page.updated | datetime }}"></time>
-      {% endif %}
-      {% if author %}<span class="byline author vcard">By <span class="fn">{{ author }}</span></span>{% endif %}
-    </p>
-  {% endunless %}
-</header>
+{% unless page.no_header %}
+  <header>
+    {% if index %}
+      <h1 class="entry-title"><a href="{{ page.url }}">{{ page.title | titlecase }}</a></h1>
+    {% else %}
+      <h1 class="entry-title">{{ page.title | titlecase }}</h1>
+    {% endif %}
+    {% unless page.no_meta %}
+      <p>
+        {% if page.date %}
+          <time datetime="{{ page.date | datetime }}" pubdate {% if page.updated %} updated {% endif %}>{{ page.date | ordinalize }}</time>
+        {% endif %}
+        {% if page.updated %}
+          <time class="updated" datetime="{{ page.updated | datetime }}"></time>
+        {% endif %}
+        {% if author %}<span class="byline author vcard">By <span class="fn">{{ author }}</span></span>{% endif %}
+      </p>
+    {% endunless %}
+  </header>
+{% endunless %}
 {% if index %}
 <div class="entry-content">{{ content | exerpt(content, page.url, 'Continue reading &raquo;') | smart_quotes }}</div>
 {% else %}
diff --git a/themes/classic/source/_includes/header.html b/themes/classic/source/_includes/header.html
index e08da6dc..de153086 100644
--- a/themes/classic/source/_includes/header.html
+++ b/themes/classic/source/_includes/header.html
@@ -1,4 +1,6 @@
-<h1><a href="/">{{ site.title }}</a></h1>
-{% if site.subtitle %}
-  <h2>{{ site.subtitle }}</h2>
-{% endif %}
+<hgroup>
+  <h1><a href="/">{{ site.title }}</a></h1>
+  {% if site.subtitle %}
+    <h2>{{ site.subtitle }}</h2>
+  {% endif %}
+</hgroup>