diff --git a/_includes/archive.html b/_includes/archive.html
new file mode 100644
index 0000000..3099179
--- /dev/null
+++ b/_includes/archive.html
@@ -0,0 +1,18 @@
+<section class="other-posts">
+  <h2>Other Posts</h2>
+  <ul class="content-index">
+    {% for post in site.posts %}
+      {% assign index = true %}
+      {% assign truncated = true %}
+      {% assign content = post.content %}
+      {% capture current_year %}{{post.date | date: "%Y"}}{% endcapture %}
+      {% capture next_year %}{{post.next.date | date: "%Y"}}{% endcapture %}
+
+      {% if current_year != next_year and next_year != '' %}
+        <li class="year-mark"><h3>{{ post.date | date: "%Y" }}</h3></li>
+      {% endif %}
+
+      <li><a href="{{ site.baseurl }}{{ post.url }}">{% include article.html %}</a></li>
+    {% endfor %}
+  </ul>
+</section>
diff --git a/_layouts/default.html b/_layouts/default.html
index 5581cee..5c57926 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -35,7 +35,9 @@ <h2>your community gem host</h2>
       </nav>
     </header>
 
-    {{ content }}
+    <section class="allcontent">
+      {{ content }}
+    </section>
 
     <footer>
       <nav>
diff --git a/_layouts/post.html b/_layouts/post.html
index 5297b24..799aa30 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -4,5 +4,4 @@
 ---
 
 {% include article.html %}
-
-<a class="allposts" href="{{ site.baseurl }}/">&larr; All blog posts</a>
+{% include archive.html %}
diff --git a/index.html b/index.html
index 93a7d92..f4f4c98 100644
--- a/index.html
+++ b/index.html
@@ -3,29 +3,10 @@
 title: RubyGems Blog
 ---
 
-<section class="allcontent">
-  {% for post in site.posts limit:1 %}
-    {% assign index = true %}
-    {% assign content = post.content %}
-    {% include article.html %}
-  {% endfor %}
+{% for post in site.posts limit:1 %}
+  {% assign index = true %}
+  {% assign content = post.content %}
+  {% include article.html %}
+{% endfor %}
 
-  <section class="other-posts">
-    <h2>Other Posts</h2>
-    <ul class="content-index">
-      {% for post in site.posts %}
-        {% assign index = true %}
-        {% assign truncated = true %}
-        {% assign content = post.content %}
-        {% capture current_year %}{{post.date | date: "%Y"}}{% endcapture %}
-        {% capture next_year %}{{post.next.date | date: "%Y"}}{% endcapture %}
-
-        {% if current_year != next_year and next_year != '' %}
-          <li class="year-mark"><h3>{{ post.date | date: "%Y" }}</h3></li>
-        {% endif %}
-
-        <li><a href="{{ site.baseurl }}{{ post.url }}">{% include article.html %}</a></li>
-      {% endfor %}
-    </ul>
-  </section>
-</section>
+{% include archive.html %}