diff --git a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
index d5581b373b..950165567d 100644
--- a/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
+++ b/akka-persistence/akka-persistence-mongo/src/main/scala/MongoStorageBackend.scala
@@ -78,10 +78,8 @@ private[akka] object MongoStorageBackend extends
         val o = dbo.get(VALUE).asInstanceOf[Map[AnyRef, AnyRef]]
         o.putAll(m)
 
-        // remove existing reference
-        removeMapStorageFor(name)
-        // and insert
-        coll.insert(new BasicDBObject().append(KEY, name).append(VALUE, o))
+        val newdbo = new BasicDBObject().append(KEY, name).append(VALUE, o)
+        coll.update(new BasicDBObject().append(KEY, name), newdbo, true, false)
       }
     }
   }
diff --git a/project/build/AkkaProject.scala b/project/build/AkkaProject.scala
index 6c770d4e54..4507193de9 100644
--- a/project/build/AkkaProject.scala
+++ b/project/build/AkkaProject.scala
@@ -162,7 +162,7 @@ class AkkaParentProject(info: ProjectInfo) extends DefaultProject(info) {
 
     lazy val log4j = "log4j" % "log4j" % "1.2.15" % "compile"
 
-    lazy val mongo = "org.mongodb" % "mongo-java-driver" % "1.4" % "compile"
+    lazy val mongo = "org.mongodb" % "mongo-java-driver" % "2.0" % "compile"
 
     lazy val multiverse = "org.multiverse" % "multiverse-alpha" % MULTIVERSE_VERSION % "compile" intransitive