diff --git a/.document b/.document
index d892ce9cf8..03c06a1ce0 100644
--- a/.document
+++ b/.document
@@ -1,7 +1,7 @@
 History.txt
 LICENSE.txt
 README.txt
-RI.txt
-RI.md
+*.md
+*.rdoc
 lib
 doc
diff --git a/.rdoc_options b/.rdoc_options
new file mode 100644
index 0000000000..54d977f238
--- /dev/null
+++ b/.rdoc_options
@@ -0,0 +1,8 @@
+exclude:
+  - lib/rdoc/rd/block_parser.ry
+  - lib/rdoc/rd/inline_parser.ry
+  - lib/rdoc/markdown.kpeg
+  - lib/rdoc/markdown/literals.kpeg
+op_dir: _site # for GH pages and should match the config of RDoc task in Rakefile
+title: rdoc Documentation
+main_page: README.rdoc
diff --git a/Rakefile b/Rakefile
index 6f1e3d1b4e..1de46fe359 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,10 +21,8 @@ task :default => :test
 
 task rdoc: :generate
 RDoc::Task.new do |doc|
-  doc.main = 'README.rdoc'
-  doc.title = "rdoc #{RDoc::VERSION} Documentation"
-  doc.rdoc_dir = '_site' # for github pages
-  doc.rdoc_files = FileList.new %w[lib/**/*.rb *.rdoc *.md doc/rdoc/markup_reference.rb] - PARSER_FILES
+  # RDoc task defaults to /html and overrides the op_dir option in .rdoc_options
+  doc.rdoc_dir = "_site" # for github pages
 end
 
 task "coverage" do