diff --git a/0.20_UPGRADE b/1.0_UPGRADE
similarity index 81%
rename from 0.20_UPGRADE
rename to 1.0_UPGRADE
index 13e1984..34635d4 100644
--- a/0.20_UPGRADE
+++ b/1.0_UPGRADE
@@ -1,4 +1,9 @@
-0.20 will require some minor code upgrades.
+You can upgrade freely from v0.20 to v1.0.
+
+However, if you're running a version < 0.20, upgrade to 0.20
+before upgrading to 1.0.
+
+The upgrade to 0.20 requires some minor code upgrades.
 
 1. Note the exception changes in HISTORY. Certain exceptions are now scoped under the BSON
 module; if you're catching these, you will need to modify your code.
diff --git a/CREDITS b/CREDITS
index e5230c3..c13ec72 100644
--- a/CREDITS
+++ b/CREDITS
@@ -10,6 +10,7 @@ Adrian Madrid, aemadrid@gmail.com
 
 Aman Gupta, aman@tmm1.net
 * Collection#save
+* Noted bug in returning query batch size.
 
 Jon Crosby, jon@joncrosby.me
 * Some code clean-up
@@ -74,3 +75,6 @@ Chuck Remes
 
 Dmitrii Golub (Houdini) and Jacques Crocker (railsjedi)
 * Support open to exclude fields on query
+
+dfitzgibbon
+* patch for ensuring bson_ext compatibility with early release of Ruby 1.8.5
diff --git a/HISTORY b/HISTORY
index 714f8cb..7377aed 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,3 +1,15 @@
+1.0 2010-4-29
+Note: if upgrading from versions prior to 0.20, be sure to upgrade
+to 0.20 before upgrading to 1.0.
+
+* Inspected ObjectID is represented in MongoDB extended json format.
+* Support for tailable cursors.
+* Configurable query response batch size (thx. to Aman Gupta)
+
+* bson_ext installs on early release of Ruby 1.8.5 (dfitzgibbon)
+* Deprecated DB#create_index. Use Collection#create_index index.
+* Removed deprecated Grid#put syntax; no longer requires a filename.
+
 0.20.1 2010-4-7
  * Added bson gem dependency.
 
diff --git a/README.rdoc b/README.rdoc
index 68f89b0..1a697f8 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -35,7 +35,6 @@ The driver also requires the BSON gem:
   $ gem install bson
 
 And for a significant performance boost, you'll want to install the C extensions:
-extensions:
 
   $ gem install bson_ext
 
diff --git a/examples/admin.rb b/examples/admin.rb
index 1aea51f..e445be9 100644
--- a/examples/admin.rb
+++ b/examples/admin.rb
@@ -9,13 +9,14 @@ host = ENV['MONGO_RUBY_DRIVER_HOST'] || 'localhost'
 port = ENV['MONGO_RUBY_DRIVER_PORT'] || Connection::DEFAULT_PORT
 
 puts "Connecting to #{host}:#{port}"
-db = Mongo::Connection.new(host, port).db('ruby-mongo-examples')
+con  = Mongo::Connection.new(host, port)
+db   = con.db('ruby-mongo-examples')
 coll = db.create_collection('test')
 
 # Erase all records from collection, if any
 coll.remove
 
-admin = db.admin
+admin = con['admin']
 
 # Profiling level set/get
 puts "Profiling level: #{admin.profiling_level}"
@@ -34,7 +35,7 @@ pp admin.profiling_info
 
 # Validate returns a hash if all is well and
 # raises an exception if there is a problem.
-info = admin.validate_collection(coll.name)
+info = db.validate_collection(coll.name)
 puts "valid = #{info['ok']}"
 puts info['result']
 
diff --git a/examples/info.rb b/examples/info.rb
index 7602d20..7790e19 100644
--- a/examples/info.rb
+++ b/examples/info.rb
@@ -24,7 +24,7 @@ p db.collection_names
 p db.collections_info
 
 # Index information
-db.create_index('test', 'a')
+coll.create_index('a')
 p db.index_information('test')
 
 # Destroy the collection
diff --git a/ext/cbson/version.h b/ext/cbson/version.h
index fbbaceb..ea736e8 100644
--- a/ext/cbson/version.h
+++ b/ext/cbson/version.h
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-#define VERSION "0.20.2"
+#define VERSION "1.0"
diff --git a/lib/bson.rb b/lib/bson.rb
index 4c92f6e..c8fbfea 100644
--- a/lib/bson.rb
+++ b/lib/bson.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module BSON
-  VERSION = "0.20.2"
+  VERSION = "1.0"
   def self.serialize(obj, check_keys=false, move_id=false)
     BSON_CODER.serialize(obj, check_keys, move_id)
   end
diff --git a/lib/mongo.rb b/lib/mongo.rb
index c44fd48..efc4dfd 100644
--- a/lib/mongo.rb
+++ b/lib/mongo.rb
@@ -1,7 +1,7 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 module Mongo
-  VERSION = "0.20.2"
+  VERSION = "1.0"
 end
 
 module Mongo