diff --git a/.themes/classic/source/_includes/custom/footer.html b/.themes/classic/source/_includes/custom/footer.html
new file mode 100644
index 00000000000..e12f067884f
--- /dev/null
+++ b/.themes/classic/source/_includes/custom/footer.html
@@ -0,0 +1,4 @@
+<p>
+  Copyright &copy; {{ site.time | date: "%Y" }} - {{ site.author }} -
+  <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
+</p>
diff --git a/.themes/classic/source/_includes/custom/navigation.html b/.themes/classic/source/_includes/custom/navigation.html
new file mode 100644
index 00000000000..8f091e16ea7
--- /dev/null
+++ b/.themes/classic/source/_includes/custom/navigation.html
@@ -0,0 +1,4 @@
+<ul role=main-navigation>
+  <li><a href="{{ root_url }}/">Blog</a></li>
+  <li><a href="{{ root_url }}/blog/archives">Archives</a></li>
+</ul>
diff --git a/.themes/classic/source/_includes/footer.html b/.themes/classic/source/_includes/footer.html
index e12f067884f..3a8c7687474 100644
--- a/.themes/classic/source/_includes/footer.html
+++ b/.themes/classic/source/_includes/footer.html
@@ -1,4 +1 @@
-<p>
-  Copyright &copy; {{ site.time | date: "%Y" }} - {{ site.author }} -
-  <span class="credit">Powered by <a href="http://octopress.org">Octopress</a></span>
-</p>
+{% include custom/footer.html %}
diff --git a/.themes/classic/source/_includes/navigation.html b/.themes/classic/source/_includes/navigation.html
index 4b1885eb557..c26908f8211 100644
--- a/.themes/classic/source/_includes/navigation.html
+++ b/.themes/classic/source/_includes/navigation.html
@@ -10,7 +10,4 @@
     <input class="search" type="text" name="q" results="0" placeholder="Search"/>
   </fieldset>
 </form>
-<ul role=main-navigation>
-  <li><a href="{{ root_url }}/">Blog</a></li>
-  <li><a href="{{ root_url }}/blog/archives">Archives</a></li>
-</ul>
+{% include custom/navigation.html %}