diff --git a/Makefile b/Makefile
index 22b0395..e50d18e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,8 @@
 all:
-	- mkdir -p var
 	npm build .
 
 clean:
-	- $(MAKE) -C ./ejdb clean
+	$(MAKE) -f ./libejdb.mk clean
 	rm -rf ./build ./var/* *.tgz
 
 .PHONY:	 all clean dummy
diff --git a/binding.gyp b/binding.gyp
index 6b89022..22d8112 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -30,7 +30,7 @@
                  '_UNICODE',
                ],
                'libraries': [
-                 '-l<(EJDB_HOME)/lib/tcejdbdll.lib'
+                 '-l<(EJDB_HOME)/lib/ejdbdll.lib'
                ],
             }, {
                'defines': [
@@ -45,8 +45,8 @@
                 'cflags': [ '-Wall', '-pedantic', '-fsigned-char', '-pthread', '-Wno-variadic-macros'],
                 'cflags_cc!' : [ '-fno-exceptions' ],
                 'libraries' : [
-                    '-L../ejdb/tcejdb',
-                    '-Wl,-Bstatic -ltcejdb',
+                    '-L../build-ejdb/src',
+                    '-Wl,-Bstatic -lejdb-1',
                     '-Wl,-Bdynamic',
                     '-lz -lpthread -lm -lc'
                 ]
@@ -62,12 +62,12 @@
                     'OTHER_LDFLAGS': [
                         '-Wl,-search_paths_first',
                         '-L./ejdb/tcejdb/static',
-                        '-lstcejdb -lz -lpthread -lm -lc'
+                        '-lsejdb -lz -lpthread -lm -lc'
                     ]
                 }
            }]
         ],
-        'include_dirs' : ['ejdb/tcejdb', '<!(node -e "require(\'nan\')")'],
+        'include_dirs' : ['build-ejdb/libejdb/include/ejdb', '<!(node -e "require(\'nan\')")'],
     },
 
     'targets' : [
diff --git a/ejdb b/ejdb
index fd1e96a..9d2cc91 160000
--- a/ejdb
+++ b/ejdb
@@ -1 +1 @@
-Subproject commit fd1e96aecfc3bffe2b0cf409b70ab85f31440a8e
+Subproject commit 9d2cc910cfa8a924a46acba0600ba247d04579bc
diff --git a/libejdb.mk b/libejdb.mk
new file mode 100644
index 0000000..7e8fca5
--- /dev/null
+++ b/libejdb.mk
@@ -0,0 +1,8 @@
+all:
+	mkdir -p build-ejdb
+	cd build-ejdb && cmake -DCMAKE_INSTALL_PREFIX=./libejdb -DCMAKE_BUILD_TYPE=Release  ../ejdb && make install
+
+clean:
+	rm -rf ./build-ejdb
+
+.PHONY:	 all clean dummy
diff --git a/platform.js b/platform.js
index 6903744..7aaecd5 100644
--- a/platform.js
+++ b/platform.js
@@ -37,7 +37,7 @@ function nix() {
             fs.writeFileSync("configure.gypi", JSON.stringify(config));
 
             console.log("Building EJDB...");
-            var m = spawn(make, ["-C", "ejdb"], {"stdio" : "inherit"});
+            var m = spawn(make, ["-f", "libejdb.mk"], {"stdio" : "inherit"});
             m.on("close", exithandler(make + " all", function() {
                 var ng = spawn("node-gyp", ["rebuild"], {stdio : "inherit"});
                 ng.on("close", exithandler("node-gyp"));