diff --git a/bookwyrm/templates/components/footer.html b/bookwyrm/templates/components/footer.html
new file mode 100644
index 00000000..047d7bfa
--- /dev/null
+++ b/bookwyrm/templates/components/footer.html
@@ -0,0 +1,49 @@
+{% load layout %}
+{% load i18n %}
+{% load static %}
+
+<footer class="footer">
+  <div class="container">
+      <div class="columns">
+          <div class="column is-one-fifth">
+              <p>
+              <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
+              </p>
+              {% if site.admin_email %}
+              <p>
+                  <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
+              </p>
+              {% endif %}
+              <p>
+                  <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
+              </p>
+          </div>
+          <div class="column content is-two-fifth">
+              {% if site.support_link %}
+              <p>
+                  <span class="icon icon-heart"></span>
+                  {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
+              </p>
+              {% endif %}
+              <p>
+              {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
+              </p>
+          </div>
+          {% if site.footer_item %}
+          <div class="column">
+              <p>{{ site.footer_item|safe }}</p>
+          </div>
+          {% endif %}
+      </div>
+  </div>
+</footer>
+
+<script>
+  var csrf_token = '{{ csrf_token }}';
+</script>
+
+<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
+<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
+
+{% block scripts %}{% endblock %}
diff --git a/bookwyrm/templates/layout.html b/bookwyrm/templates/layout.html
index f2d04f96..50a7ae6d 100644
--- a/bookwyrm/templates/layout.html
+++ b/bookwyrm/templates/layout.html
@@ -222,50 +222,7 @@
     <p id="status-error-message" class="live-message notification is-danger p-3 pr-5 pl-5 is-hidden">{% trans "Error posting status" %}</p>
 </div>
 
-<footer class="footer">
-    <div class="container">
-        <div class="columns">
-            <div class="column is-one-fifth">
-                <p>
-                <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
-                </p>
-                {% if site.admin_email %}
-                <p>
-                    <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
-                </p>
-                {% endif %}
-                <p>
-                    <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
-                </p>
-            </div>
-            <div class="column content is-two-fifth">
-                {% if site.support_link %}
-                <p>
-                    <span class="icon icon-heart"></span>
-                    {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
-                </p>
-                {% endif %}
-                <p>
-                {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
-                </p>
-            </div>
-            {% if site.footer_item %}
-            <div class="column">
-                <p>{{ site.footer_item|safe }}</p>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</footer>
+{% include 'components/footer.html' %}
 
-<script>
-    var csrf_token = '{{ csrf_token }}';
-</script>
-
-<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
-
-{% block scripts %}{% endblock %}
 </body>
 </html>
diff --git a/bookwyrm/templates/ostatus/template.html b/bookwyrm/templates/ostatus/template.html
index 7d670b0a..04e432aa 100644
--- a/bookwyrm/templates/ostatus/template.html
+++ b/bookwyrm/templates/ostatus/template.html
@@ -48,59 +48,13 @@
         </div>
     </div>
 </nav>
-
-
 <div class="section is-flex-grow-1 columns is-centered">
     <div class="block column is-one-third">
         {% block content%}{% endblock %}
     </div>
 </div>
 
-<!-- TODO: pull footer into its own template: this is the same as generic template footer -->
-<footer class="footer">
-    <div class="container">
-        <div class="columns">
-            <div class="column is-one-fifth">
-                <p>
-                <a href="{% url 'about' %}">{% blocktrans with site_name=site.name %}About {{ site_name }}{% endblocktrans %}</a>
-                </p>
-                {% if site.admin_email %}
-                <p>
-                    <a href="mailto:{{ site.admin_email }}">{% trans "Contact site admin" %}</a>
-                </p>
-                {% endif %}
-                <p>
-                    <a href="https://docs.joinbookwyrm.com/">{% trans "Documentation" %}</a>
-                </p>
-            </div>
-            <div class="column content is-two-fifth">
-                {% if site.support_link %}
-                <p>
-                    <span class="icon icon-heart"></span>
-                    {% blocktrans with site_name=site.name support_link=site.support_link support_title=site.support_title %}Support {{ site_name }} on <a href="{{ support_link }}" target="_blank">{{ support_title }}</a>{% endblocktrans %}
-                </p>
-                {% endif %}
-                <p>
-                {% blocktrans %}BookWyrm's source code is freely available. You can contribute or report issues on <a href="https://github.com/mouse-reeve/bookwyrm">GitHub</a>.{% endblocktrans %}
-                </p>
-            </div>
-            {% if site.footer_item %}
-            <div class="column">
-                <p>{{ site.footer_item|safe }}</p>
-            </div>
-            {% endif %}
-        </div>
-    </div>
-</footer>
+{% include 'components/footer.html' %}
 
-<script>
-    var csrf_token = '{{ csrf_token }}';
-</script>
-
-<script src="{% static "js/bookwyrm.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/localstorage.js" %}?v={{ js_cache }}"></script>
-<script src="{% static "js/status_cache.js" %}?v={{ js_cache }}"></script>
-
-{% block scripts %}{% endblock %}
 </body>
 </html>