diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
index 652a2ff5..a6b56f96 100644
--- a/doc/_templates/layout.html
+++ b/doc/_templates/layout.html
@@ -8,6 +8,19 @@
 <link rel="stylesheet" href="_static/cppformat.css">
 {% endblock %}
 
+{%- macro searchform(classes, button) %}
+<form class="{{classes}}" role="search" action="{{ pathto('search') }}" method="get">
+  <div class="form-group">
+    <input type="text" name="q" class="form-control" placeholder="Search">
+  </div>
+  <input type="hidden" name="check_keywords" value="yes" />
+  <input type="hidden" name="area" value="default" />
+  {% if button %}
+    <input type="submit" class="btn btn-default" value="search">
+  {% endif %}
+</form>
+{%- endmacro %}
+
 {% block header %}
 <nav class="navbar navbar-inverse">
   <div class="container">
@@ -45,14 +58,7 @@
             {% endfor %}
           </ul>
           {% if pagename != 'search' %}
-          <!-- TODO: use the same form on the Search page -->
-          <form class="navbar-form navbar-right" role="search" action="{{ pathto('search') }}" method="get">
-            <div class="form-group">
-              <input type="text" name="q" class="form-control" placeholder="Search">
-              <input type="hidden" name="check_keywords" value="yes" />
-              <input type="hidden" name="area" value="default" />
-            </div>
-          </form>
+            {{ searchform('navbar-form navbar-right', False) }}
           {%endif%}
         </div> <!-- /.navbar-collapse -->
       </div> <!-- /.col-md-offset-2 -->
diff --git a/doc/_templates/search.html b/doc/_templates/search.html
new file mode 100644
index 00000000..488e0b5d
--- /dev/null
+++ b/doc/_templates/search.html
@@ -0,0 +1,55 @@
+{#
+    basic/search.html
+    ~~~~~~~~~~~~~~~~~
+
+    Template for the search page.
+
+    :copyright: Copyright 2007-2015 by the Sphinx team, see AUTHORS.
+    :license: BSD, see LICENSE for details.
+#}
+{%- extends "layout.html" %}
+{% set title = _('Search') %}
+{% set script_files = script_files + ['_static/searchtools.js'] %}
+{% block extrahead %}
+  <script type="text/javascript">
+    jQuery(function() { Search.loadIndex("{{ pathto('searchindex.js', 1) }}"); });
+  </script>
+  {# this is used when loading the search index using $.ajax fails,
+     such as on Chrome for documents on localhost #}
+  <script type="text/javascript" id="searchindexloader"></script>
+  {{ super() }}
+{% endblock %}
+{% block body %}
+  <h1 id="search-documentation">{{ _('Search') }}</h1>
+  <div id="fallback" class="admonition warning">
+  <script type="text/javascript">$('#fallback').hide();</script>
+  <p>
+    {% trans %}Please activate JavaScript to enable the search
+    functionality.{% endtrans %}
+  </p>
+  </div>
+  <p>
+    {% trans %}From here you can search these documents. Enter your search
+    words into the box below and click "search". Note that the search
+    function will automatically search for all of the words. Pages
+    containing fewer words won't appear in the result list.{% endtrans %}
+  </p>
+  {{ searchform('form-inline', True) }}
+  {% if search_performed %}
+    <h2>{{ _('Search Results') }}</h2>
+    {% if not search_results %}
+      <p>{{ _('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.') }}</p>
+    {% endif %}
+  {% endif %}
+  <div id="search-results">
+  {% if search_results %}
+    <ul>
+    {% for href, caption, context in search_results %}
+      <li><a href="{{ pathto(item.href) }}">{{ caption }}</a>
+        <div class="context">{{ context|e }}</div>
+      </li>
+    {% endfor %}
+    </ul>
+  {% endif %}
+  </div>
+{% endblock %}