diff --git a/_includes/footer.html b/_includes/footer.html
index bb3c13e3..f17a0b82 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -38,13 +38,16 @@
         </div>
     </div>
 </footer>
-<script>var searchData = "{{ site.baseurl }}/search_data.json"</script>
-<script src="{{ "/assets/js/lunr.min.js" | relative_url }}"></script>
+
 <script>window.jQuery || document.write('<script src="{{ "/assets/js/vendor/jquery-1.11.2.min.js" | relative_url }}"><\/script>')</script>
 <script src="{{ "/assets/js/vendor/bootstrap.min.js" | relative_url }}"></script>
-
 <script src="{{ "/assets/js/main.js" | relative_url }}"></script>
-<script src="{{ "/assets/js/search.js" | relative_url }}"></script>
+
+{% if site.data.conf.search %}
+    <script>var searchData = "{{ site.baseurl }}/search_data.json"</script>
+    <script src="{{ "/assets/js/lunr.min.js" | relative_url }}"></script>
+    <script src="{{ "/assets/js/search.js" | relative_url }}"></script>
+{% endif %}
 
 {% if page.layout == 'proposedContent' %}
 <script src="{{ "/assets/js/vendor/tabletop.js" | relative_url }}"></script>
diff --git a/search_data.json b/search_data.json
index 59e5334e..61e02111 100644
--- a/search_data.json
+++ b/search_data.json
@@ -1,6 +1,7 @@
 ---
 layout: null
 ---
+{% if site.data.conf.search %}
 {
   {% for post in site.posts %}
 
@@ -56,3 +57,4 @@ layout: null
 
   {% endfor %}
 }
+{% endif %}