diff --git a/api.coffee b/api.coffee
index 06f9ce9..10284b5 100644
--- a/api.coffee
+++ b/api.coffee
@@ -246,7 +246,7 @@ else
             Manufacturer : request.headers.manufacturer,
           }
 
-          gs = new mongodb.GridStore(db.mongo.db, filename, 'w', {metadata : metadata})
+          gs = new mongodb.GridStore(db.mongoDb, filename, 'w', {metadata : metadata})
           gs.open((err, gs) ->
             gs.write(request.getBody('binary'), (err, res) ->
               gs.close((err) ->
@@ -256,7 +256,7 @@ else
             )
           )
         else if request.method == 'DELETE'
-          mongodb.GridStore.unlink(db.mongo.db, filename, (err) ->
+          mongodb.GridStore.unlink(db.mongoDb, filename, (err) ->
             response.writeHead(200)
             response.end()
           )
diff --git a/db.coffee b/db.coffee
index 5d8f938..dca4476 100644
--- a/db.coffee
+++ b/db.coffee
@@ -12,15 +12,17 @@ devicesCollection = null
 presetsCollection = null
 objectsCollection = null
 
-dbserver = new mongodb.Server(config.MONGODB_SOCKET, 0, {auto_reconnect: true})
-db = new mongodb.Db(config.DATABASE_NAME, dbserver, {native_parser:true, safe:true})
-
-exports.mongo = {
-  db : db,
-  server : dbserver
+options = {
+  db : {
+    native_parser: true
+  }
+  server : {
+    auto_reconnect : true
+  }
 }
 
-db.open( (err, db) ->
+mongodb.MongoClient.connect("mongodb://#{config.MONGODB_SOCKET}/#{config.DATABASE_NAME}", options, (err, db) ->
+  exports.mongoDb = db
   db.collection('tasks', (err, collection) ->
     exports.tasksCollection = tasksCollection = collection
     collection.ensureIndex({device: 1, timestamp: 1}, (err) ->