diff --git a/ckan/public/base/less/footer.less b/ckan/public/base/less/footer.less
index c2dd373a28f..8abc2d9d389 100644
--- a/ckan/public/base/less/footer.less
+++ b/ckan/public/base/less/footer.less
@@ -5,7 +5,8 @@
 }
 
 .site-footer,
-.site-footer label {
+.site-footer label,
+.site-footer small {
   color: #fff;
   color: @footerTextColor;
 }
diff --git a/ckan/templates/footer.html b/ckan/templates/footer.html
index a09511caf20..151ca81fe29 100644
--- a/ckan/templates/footer.html
+++ b/ckan/templates/footer.html
@@ -1,30 +1,36 @@
 <footer class="site-footer">
   <div class="container">
-
-    <nav class="footer-links row-fluid">
-      <ul class="unstyled row-fluid">
-        {% block footer_links %}
-          <li><a href="#">Terms and Conditions</a></li>
-          <li><a href="#">Accessibility</a></li>
-          <li><a href="#">Code of conduct</a></li>
-          <li><a href="#">Moderation policy</a></li>
-          <li><a href="#">FAQ</a></li>
-          <li><a href="#">Privacy</a></li>
-          <li><a href="#">Contact us</a></li>
-          <li><a href="#">Consultation</a></li>
+    {% block footer_content %}
+      <nav class="footer-links row-fluid">
+        {% block footer_nav %}
+          <ul class="unstyled row-fluid">
+            {% block footer_links %}
+              <li><a href="#">Terms and Conditions</a></li>
+              <li><a href="#">Accessibility</a></li>
+              <li><a href="#">Code of conduct</a></li>
+              <li><a href="#">Moderation policy</a></li>
+              <li><a href="#">FAQ</a></li>
+              <li><a href="#">Privacy</a></li>
+              <li><a href="#">Contact us</a></li>
+              <li><a href="#">Consultation</a></li>
+            {% endblock %}
+          </ul>
+        {% endblock %}
+      </nav>
+      <div class="attribution">
+        {% block footer_attribution %}
+          <p><strong>Powered by</strong> <a class="hide-text ckan-footer-logo" href="http://ckan.org">CKAN</a></p>
         {% endblock %}
-      </ul>
-    </nav>
-    <div class="attribution">
-      {% block footer_attribution %}
-        <p><strong>Powered by</strong> <a class="hide-text ckan-footer-logo" href="http://ckan.org">CKAN</a></p>
-      {% endblock %}
-      {% block footer_lang %}
-        {% snippet "snippets/language_selector.html" %}
-      {% endblock %}
-    </div>
+        {% block footer_lang %}
+          {% snippet "snippets/language_selector.html" %}
+        {% endblock %}
+      </div>
+    {% endblock %}
   </div>
-  {% if config.debug %}
-    {% include 'snippets/debug.html' %}
-  {% endif %}
+
+  {% block footer_debug %}
+    {% if config.debug %}
+      {% include 'snippets/debug.html' %}
+    {% endif %}
+  {% endblock %}
 </footer>