diff --git a/inc/config.php b/inc/config.php
index db424e36..c206e167 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -1641,6 +1641,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 1be614e3..e18279eb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -57,6 +57,17 @@
 	
 	{% if config.global_message %}<hr /><div class="blotter">{{ config.global_message }}</div>{% endif %}
 	<hr />
+	<!-- Start Search Form -->
+	{% if config.board_search %}
+        	<form style="display:inline" action="/search.php">
+                	<p style="margin: 10px;">
+                    		<input type="text" name="search" placeholder="{{ board.uri }} search">
+                    		<input type="hidden" name="board" value="{{ board.uri }}">
+                    		<input type="submit" value="Search">
+                	</p>
+        	</form>
+    	{% endif %}
+    	<!-- End Search Form -->
 	<form name="postcontrols" action="{{ config.post_url }}" method="post">
 	<input type="hidden" name="board" value="{{ board.uri }}" />
 	{% if mod %}<input type="hidden" name="mod" value="1" />{% endif %}