diff --git a/.rvmrc b/.rvmrc
index 0377262..c4c5c95 100644
--- a/.rvmrc
+++ b/.rvmrc
@@ -1,3 +1,2 @@
-rvm jruby-head@jmongo --create
-export JRUBY_OPTS="--1.9"
+rvm jruby-1.7.0@jmongo --create
 
diff --git a/lib/jmongo.rb b/lib/jmongo.rb
index 41004d3..56322c7 100644
--- a/lib/jmongo.rb
+++ b/lib/jmongo.rb
@@ -21,7 +21,7 @@
 require 'java'
 
 require 'require_all'
-require_rel 'jmongo/*.jar'
+require_rel 'jmongo/mongo-2.10.0.jar'
 
 require_rel 'jmongo/**/*.rb'
 
diff --git a/lib/jmongo/connection.rb b/lib/jmongo/connection.rb
index 5716515..5f4ad7c 100644
--- a/lib/jmongo/connection.rb
+++ b/lib/jmongo/connection.rb
@@ -31,27 +31,25 @@ def initialize host = nil, port = nil, opts = {}
         @mongo_uri = opts[:new_from_uri]
         @options = @mongo_uri.options
         @write_concern = @options.write_concern
-        @connection = JMongo::Mongo.new(@mongo_uri)
+        @connection = JMongo::MongoClient.new(@mongo_uri)
       else
         @host = host || 'localhost'
         @port = port || 27017
         @server_address = JMongo::ServerAddress.new @host, @port
-        @options = JMongo::MongoOptions.new
+        @options = JMongo::MongoClientOptions::Builder.new
         opts.each do |k,v|
           key = k.to_sym
           jmo_key = JMongo.options_ruby2java_lu(key)
           case jmo_key
           when :safe
             @write_concern = DB.write_concern(v)
-            @options.w = @write_concern.w
-            @options.wtimeout = @write_concern.wtimeout
-            @options.fsync = @write_concern.fsync
+            @options.write_concern @write_concern
           else
             jmo_val = JMongo.options_ruby2java_xf(key, v)
             @options.send("#{jmo_key}=", jmo_val)
           end
         end
-        @connection = JMongo::Mongo.new(@server_address, @options)
+        @connection = JMongo::MongoClient.new(@server_address, @options.build)
       end
       @connector = @connection.connector
       add = @connector.address
diff --git a/lib/jmongo/cursor.rb b/lib/jmongo/cursor.rb
index 35d8d6a..309b55c 100644
--- a/lib/jmongo/cursor.rb
+++ b/lib/jmongo/cursor.rb
@@ -333,7 +333,6 @@ def spawn_cursor
         @j_cursor = @j_cursor.addOption JMongo::Bytes::QUERYOPTION_NOTIMEOUT unless @timeout
         @j_cursor = @j_cursor.addOption JMongo::Bytes::QUERYOPTION_TAILABLE if @tailable
       end
-
       self
     end
 
diff --git a/lib/jmongo/mongo-2.10.0.jar b/lib/jmongo/mongo-2.10.0.jar
new file mode 100644
index 0000000..d621c0f
Binary files /dev/null and b/lib/jmongo/mongo-2.10.0.jar differ
diff --git a/lib/jmongo/mongo-2.6.5.gb1.jar b/lib/jmongo/mongo-2.6.5.gb1.jar
deleted file mode 100644
index 1abc4fe..0000000
Binary files a/lib/jmongo/mongo-2.6.5.gb1.jar and /dev/null differ
diff --git a/lib/jmongo/mongo/jmongo.rb b/lib/jmongo/mongo/jmongo.rb
index 06db5a4..447a97f 100644
--- a/lib/jmongo/mongo/jmongo.rb
+++ b/lib/jmongo/mongo/jmongo.rb
@@ -6,8 +6,8 @@ module JMongo
   java_import com.mongodb.DBCollection
   java_import com.mongodb.DBCursor
   java_import com.mongodb.DBObject
-  java_import com.mongodb.Mongo
-  java_import com.mongodb.MongoOptions
+  java_import com.mongodb.MongoClient
+  java_import com.mongodb.MongoClientOptions
   java_import com.mongodb.ServerAddress
   java_import com.mongodb.WriteConcern
   java_import com.mongodb.WriteResult