diff --git a/.gitignore b/.gitignore
index 49a172d..c6ac2ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ build
 *.pyc
 .DS_Store
 nohup.out
-build_config.mk
\ No newline at end of file
+build_config.mk
+var/
diff --git a/bootstrap.sh b/bootstrap.sh
index 2569987..ee260b7 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -11,7 +11,7 @@ go get github.com/szferi/gomdb
 
 go get github.com/boltdb/bolt
 
-go get gopkg.in/mgo.v2/bson
 go get github.com/ugorji/go/codec
 go get github.com/BurntSushi/toml
 
+go get github.com/siddontang/go-bson/bson
diff --git a/server/client_http.go b/server/client_http.go
index 9a4057b..6707e24 100644
--- a/server/client_http.go
+++ b/server/client_http.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 
 	"encoding/json"
+	"github.com/siddontang/go-bson/bson"
 	"github.com/ugorji/go/codec"
-	"gopkg.in/mgo.v2/bson"
 )
 
 var allowedContentTypes = map[string]struct{}{