diff --git a/lib/server/rest/fs/delete.js b/lib/server/rest/fs/delete.js
index 8f28f88a..a4fe755a 100644
--- a/lib/server/rest/fs/delete.js
+++ b/lib/server/rest/fs/delete.js
@@ -5,8 +5,8 @@
         fs          = require('fs'),
         dir         = main.dir,
         Util        = main.util,
-        fse         = main.require('fs-extra') || {
-            remove  : fs.rmdir.bind(fs),
+        fse         = {
+            remove  : main.require('rimraf') || fs.rmdir.bind(fs),
         };
     
     exports.onDelete = onDelete;
diff --git a/lib/server/rest/fs/put.js b/lib/server/rest/fs/put.js
index 4dc4bccc..720e07b1 100644
--- a/lib/server/rest/fs/put.js
+++ b/lib/server/rest/fs/put.js
@@ -9,8 +9,8 @@
         dir         = main.srvrequire('dir'),
         diff        = main.diff,
         CloudFunc   = main.cloudfunc,
-        fse         = main.require('fs-extra') || {
-            mkdirs  : fs.mkdir.bind(fs),
+        fse         =  {
+            mkdirs  : main.require('mkdirp') || fs.mkdir.bind(fs),
         };
     
     exports.onPut = onPut;
diff --git a/package.json b/package.json
index 94a28826..0273223f 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,8 @@
         "socket.io": "0.9.16",
         "express": "3.5.x",
         "http-auth": "2.1.x",
-        "fs-extra": "0.8.x",
+        "rimraf": "~2.2.6",
+        "mkdirp": "~0.3.5",
         "marked": "~0.3.2"
     },
     "devDependencies": {