diff --git a/lib/sdoc/generator.rb b/lib/sdoc/generator.rb
index e3d19d89..3723e639 100644
--- a/lib/sdoc/generator.rb
+++ b/lib/sdoc/generator.rb
@@ -122,7 +122,6 @@ class RDoc::Generator::SDoc
 
   def self.setup_options(options)
     @github = false
-    options.search_index = true
 
     opt = options.option_parser
     opt.separator nil
@@ -134,18 +133,6 @@ def self.setup_options(options)
     end
     opt.separator nil
 
-    opt.on("--without-search", "-s",
-            "Do not generate index file for search engines.",
-            "SDoc uses javascript to reference individual documentation pages.",
-            "Search engine crawlers are not smart enough to find all the",
-            "referenced pages.",
-            "To help them SDoc generates a static file with links to every",
-            "documentation page. This file is not shown to the user."
-            ) do
-      options.search_index = false
-    end
-    opt.separator nil
-
   end
 
   def initialize(store, options)
@@ -175,7 +162,6 @@ def generate
     generate_file_files
     generate_class_files
     generate_index_file
-    generate_search_index if @options.search_index
   end
 
   def class_dir
diff --git a/spec/rdoc_generator_spec.rb b/spec/rdoc_generator_spec.rb
index 2576b73c..59e67833 100644
--- a/spec/rdoc_generator_spec.rb
+++ b/spec/rdoc_generator_spec.rb
@@ -37,26 +37,4 @@
     err.wont_match(/^invalid options/)
     @options.github.must_equal true
   end
-
-  it "should parse no search engine index option" do
-    @options.search_index.must_equal true
-
-    _, err = capture_io do
-      @parser.parse %w[--without-search]
-    end
-
-    err.wont_match(/^invalid options/)
-    @options.search_index.must_equal false
-  end
-
-  it "should parse search-index shorthand option" do
-    @options.search_index.must_equal true
-    _, err = capture_io do
-      @parser.parse %w[-s]
-    end
-
-    err.wont_match(/^invalid options/)
-    @options.search_index.must_equal false
-  end
-
 end