diff --git a/modules/cachedb_mongodb/Makefile b/modules/cachedb_mongodb/Makefile
index cd1aafc0b0..e361505a3c 100644
--- a/modules/cachedb_mongodb/Makefile
+++ b/modules/cachedb_mongodb/Makefile
@@ -10,7 +10,9 @@ NAME=cachedb_mongodb.so
 include ../../lib/json/Makefile.json
 ifeq ($(CROSS_COMPILE),)
 MONGOC_BUILDER := $(shell \
-	if pkg-config --exists libmongoc-1.0; then \
+	if pkg-config --exists mongoc2; then \
+		echo 'pkg-config mongoc2'; \
+	elif pkg-config --exists libmongoc-1.0; then \
 		echo 'pkg-config libmongoc-1.0'; \
 	fi)
 endif
diff --git a/modules/cachedb_mongodb/cachedb_mongodb_dbase.h b/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
index cbe4855561..0eaf766670 100644
--- a/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
+++ b/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
@@ -27,8 +27,8 @@
 
 #define MONGO_HAVE_STDINT 1
 
-#include <mongoc.h>
-#include <bson.h>
+#include <mongoc/mongoc.h>
+#include <bson/bson.h>
 
 #include <stdint.h>
 
diff --git a/modules/cachedb_mongodb/cachedb_mongodb_json.h b/modules/cachedb_mongodb/cachedb_mongodb_json.h
index f3bcbd9bbc..85bbbab8dc 100644
--- a/modules/cachedb_mongodb/cachedb_mongodb_json.h
+++ b/modules/cachedb_mongodb/cachedb_mongodb_json.h
@@ -23,7 +23,7 @@
 
 #include "cachedb_mongodb_dbase.h"
 
-#include <bson.h>
+#include <bson/bson.h>
 #include <stdint.h>
 
 int json_to_bson(char *json,bson_t *bb);