diff --git a/inc/config.php b/inc/config.php
index 2d61bab1..fb51dc3b 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1727,6 +1727,9 @@
     // Enable the search form
     $config['search']['enable'] = false;
 
+    // Enable search in the board index.
+    $config['board_search'] = false;
+
     // Maximal number of queries per IP address per minutes
     $config['search']['queries_per_minutes'] = Array(15, 2);
 
diff --git a/templates/index.html b/templates/index.html
index 259e99f8..0b48979a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -68,6 +68,13 @@
 		{% if config.home_link %}
 		 |  <a href="{{ config.root }}">Home</a>
 		{% endif %}
+			{% if board.uri %}
+			<form style="display:inline" action="/search.php">
+				 |  <input type="text" name="search" placeholder=" /{{ board.uri }}/ search">
+					<input type="hidden" name="board" value="{{ board.uri }}">
+					<input type="submit" value="Search">
+			</form>
+		{% endif %}
 	<hr />
 
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">