diff --git a/README.md b/README.md
index 5f2e643..fed1af4 100644
--- a/README.md
+++ b/README.md
@@ -4,14 +4,15 @@ This is the 10gen-supported Ruby driver for [MongoDB](http://www.mongodb.org).
 
 This documentation includes other articles of interest, include:
 
-1. [A tutorial](http://api.mongodb.org/ruby/current/file.TUTORIAL.html).
-2. [Replica Sets in Ruby](http://api.mongodb.org/ruby/current/file.REPLICA_SETS.html).
-3. [GridFS in Ruby](http://api.mongodb.org/ruby/current/file.GridFS.html).
-4. [Frequently Asked Questions](http://api.mongodb.org/ruby/current/file.FAQ.html).
-5. [History](http://api.mongodb.org/ruby/current/file.HISTORY.html).
-6. [Credits](http://api.mongodb.org/ruby/current/file.CREDITS.html).
+1. [A tutorial](file.TUTORIAL.html).
+2. [Replica Sets in Ruby](file.REPLICA_SETS.html).
+3. [Write Concern in Ruby](file.WRITE_CONCERN.html).
+4. [GridFS in Ruby](file.GridFS.html).
+5. [Frequently Asked Questions](http://api.mongodb.org/ruby/current/file.FAQ.html).
+6. [History](http://api.mongodb.org/ruby/current/file.HISTORY.html).
+7. [Credits](http://api.mongodb.org/ruby/current/file.CREDITS.html).
 
-Here's a quick code sample. Again, see the [MongoDB Ruby Tutorial](http://api.mongodb.org/ruby/current/file.TUTORIAL.html)
+Here's a quick code sample. Again, see the [MongoDB Ruby Tutorial](file.TUTORIAL.html)
 for much more:
 
     require 'rubygems'
diff --git a/Rakefile b/Rakefile
index c08205a..753ab04 100644
--- a/Rakefile
+++ b/Rakefile
@@ -161,7 +161,7 @@ task :rdoc do
   version = eval(File.read("mongo.gemspec")).version
   out = File.join('html', version.to_s)
   FileUtils.rm_rf('html')
-  system "rdoc --main README.rdoc --op #{out} --inline-source --quiet README.rdoc `find lib -name '*.rb'`"
+  system "rdoc --main README.md --op #{out} --inline-source --quiet README.md `find lib -name '*.rb'`"
 end
 
 desc "Generate YARD documentation"
diff --git a/docs/GridFS.md b/docs/GridFS.md
index 2790f8e..03b3eb1 100644
--- a/docs/GridFS.md
+++ b/docs/GridFS.md
@@ -4,7 +4,7 @@ GridFS, which stands for "Grid File Store," is a specification for storing large
 
 ### The Grid class
 
-The [Grid class](http://api.mongodb.org/ruby/current/Mongo/Grid.html) represents the core GridFS implementation. Grid gives you a simple file store, keyed on a unique ID. This means that duplicate filenames aren't a problem. To use the Grid class, first make sure you have a database, and then instantiate a Grid:
+The [Grid class](Mongo/Grid.html) represents the core GridFS implementation. Grid gives you a simple file store, keyed on a unique ID. This means that duplicate filenames aren't a problem. To use the Grid class, first make sure you have a database, and then instantiate a Grid:
 
 
     @db = Mongo::Connection.new.db('social_site')
diff --git a/docs/TUTORIAL.md b/docs/TUTORIAL.md
index fa164c4..4151b9c 100644
--- a/docs/TUTORIAL.md
+++ b/docs/TUTORIAL.md
@@ -2,7 +2,7 @@
 
 This tutorial gives many common examples of using MongoDB with the Ruby driver. If you're looking for information on data modeling, see [MongoDB Data Modeling and Rails](http://www.mongodb.org/display/DOCS/MongoDB+Data+Modeling+and+Rails). Links to the various object mappers are listed on our [object mappers page](http://www.mongodb.org/display/DOCS/Object+Mappers+for+Ruby+and+MongoDB).
 
-Interested in GridFS? See [GridFS in Ruby](http://www.mongodb.org/display/DOCS/GridFS+in+Ruby).
+Interested in GridFS? See [GridFS in Ruby](file.GridFS.html).
 
 As always, the [latest source for the Ruby driver](http://github.com/mongodb/mongo-ruby-driver) can be found on [github](http://github.com/mongodb/mongo-ruby-driver/).