diff --git a/lib/sdoc/generator.rb b/lib/sdoc/generator.rb
index 861b760d..023d0667 100644
--- a/lib/sdoc/generator.rb
+++ b/lib/sdoc/generator.rb
@@ -25,9 +25,6 @@ class RDoc::Generator::SDoc
 
   DESCRIPTION = 'Searchable HTML documentation'
 
-  FILE_DIR = 'files'
-  CLASS_DIR = 'classes'
-
   RESOURCES_DIR = File.join('resources', '.')
 
   attr_reader :options
@@ -94,11 +91,11 @@ def generate
   end
 
   def class_dir
-    CLASS_DIR
+    nil
   end
 
   def file_dir
-    FILE_DIR
+    nil
   end
 
   ### Determines index page based on @options.main_page (or lack thereof)
diff --git a/lib/sdoc/rdoc_monkey_patches.rb b/lib/sdoc/rdoc_monkey_patches.rb
index c8ab7443..fac12978 100644
--- a/lib/sdoc/rdoc_monkey_patches.rb
+++ b/lib/sdoc/rdoc_monkey_patches.rb
@@ -1,5 +1,19 @@
 require "rdoc"
 
+RDoc::TopLevel.prepend(Module.new do
+  def path
+    File.join("files", super)
+  end
+end)
+
+
+RDoc::ClassModule.prepend(Module.new do
+  def path
+    File.join("classes", super)
+  end
+end)
+
+
 RDoc::TopLevel.prepend(Module.new do
   attr_writer :path
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index f5e25e00..ada0ca7b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -28,7 +28,7 @@ def rdoc_top_level_for(ruby_code)
   # foolproof way to initialize it is by simply running it with a dummy file.
   $rdoc_for_specs ||= rdoc_dry_run("--files", __FILE__)
 
-  $rdoc_for_specs.store = RDoc::Store.new
+  $rdoc_for_specs.store = RDoc::Store.new(RDoc::Options.new)
 
   Dir.mktmpdir do |dir|
     path = "#{dir}/ruby_code.rb"