diff --git a/lib/commands/cache/clean.js b/lib/commands/cache/clean.js
index 35e3a314..ac5681ce 100644
--- a/lib/commands/cache/clean.js
+++ b/lib/commands/cache/clean.js
@@ -1,5 +1,5 @@
 var EventEmitter = require('events').EventEmitter;
-var fs = require('fs');
+var fs = require('graceful-fs');
 var mout = require('mout');
 var Q = require('q');
 var rimraf = require('rimraf');
diff --git a/lib/commands/help.js b/lib/commands/help.js
index 44398fd9..ce44f335 100644
--- a/lib/commands/help.js
+++ b/lib/commands/help.js
@@ -1,6 +1,6 @@
 var EventEmitter = require('events').EventEmitter;
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var cli = require('../util/cli');
 var createError = require('../util/createError');
 
diff --git a/lib/commands/link.js b/lib/commands/link.js
index 4e74eefa..ac3bfe0e 100644
--- a/lib/commands/link.js
+++ b/lib/commands/link.js
@@ -1,5 +1,5 @@
 var EventEmitter = require('events').EventEmitter;
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mkdirp = require('mkdirp');
 var rimraf = require('rimraf');
diff --git a/lib/core/Manager.js b/lib/core/Manager.js
index 6de30b92..26f093cc 100644
--- a/lib/core/Manager.js
+++ b/lib/core/Manager.js
@@ -4,7 +4,7 @@ var semver = require('semver');
 var path = require('path');
 var mkdirp = require('mkdirp');
 var rimraf = require('rimraf');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var promptly = require('promptly');
 var PackageRepository = require('./PackageRepository');
 var copy = require('../util/copy');
diff --git a/lib/core/Project.js b/lib/core/Project.js
index e748bfb1..2ab5ba0d 100644
--- a/lib/core/Project.js
+++ b/lib/core/Project.js
@@ -1,6 +1,6 @@
 var glob = require('glob');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var crypto = require('crypto');
 var Q = require('q');
 var mout = require('mout');
diff --git a/lib/core/ResolveCache.js b/lib/core/ResolveCache.js
index f07922ae..af2c6f17 100644
--- a/lib/core/ResolveCache.js
+++ b/lib/core/ResolveCache.js
@@ -1,5 +1,5 @@
 var crypto = require('crypto');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var semver = require('semver');
 var mout = require('mout');
diff --git a/lib/core/resolverFactory.js b/lib/core/resolverFactory.js
index 16c50572..1bb875aa 100644
--- a/lib/core/resolverFactory.js
+++ b/lib/core/resolverFactory.js
@@ -1,5 +1,5 @@
 var Q = require('q');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var resolvers = require('./resolvers');
diff --git a/lib/core/resolvers/FsResolver.js b/lib/core/resolvers/FsResolver.js
index ca88f926..6d4eeea4 100644
--- a/lib/core/resolvers/FsResolver.js
+++ b/lib/core/resolvers/FsResolver.js
@@ -1,5 +1,5 @@
 var util = require('util');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mout = require('mout');
 var Q = require('q');
diff --git a/lib/core/resolvers/Resolver.js b/lib/core/resolvers/Resolver.js
index 097e7187..cc237985 100644
--- a/lib/core/resolvers/Resolver.js
+++ b/lib/core/resolvers/Resolver.js
@@ -1,4 +1,4 @@
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Q = require('q');
 var tmp = require('tmp');
diff --git a/lib/core/resolvers/UrlResolver.js b/lib/core/resolvers/UrlResolver.js
index 77389ebd..6ee1023d 100644
--- a/lib/core/resolvers/UrlResolver.js
+++ b/lib/core/resolvers/UrlResolver.js
@@ -1,6 +1,6 @@
 var util = require('util');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var url = require('url');
 var request = require('request');
 var Q = require('q');
diff --git a/lib/util/copy.js b/lib/util/copy.js
index a8ca905a..f6f2e04c 100644
--- a/lib/util/copy.js
+++ b/lib/util/copy.js
@@ -1,6 +1,6 @@
 var fstream = require('fstream');
 var fstreamIgnore = require('fstream-ignore');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var Q = require('q');
 
 function copy(reader, writer) {
diff --git a/lib/util/extract.js b/lib/util/extract.js
index 0b24bdad..cbe2fe9e 100644
--- a/lib/util/extract.js
+++ b/lib/util/extract.js
@@ -1,5 +1,5 @@
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var zlib = require('zlib');
 var unzip = require('unzip');
 var tar = require('tar');
diff --git a/lib/util/template.js b/lib/util/template.js
index d29aacb1..a237a77b 100644
--- a/lib/util/template.js
+++ b/lib/util/template.js
@@ -1,7 +1,6 @@
 require('colors');
-var Q = require('q');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var Handlebars = require('handlebars');
 var mout = require('mout');
 var helpers = require('../../templates/helpers');
diff --git a/package.json b/package.json
index 88595621..b3a03259 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   },
   "dependencies": {
     "archy": "0.0.2",
+    "abbrev": "~1.0.4",
     "bower-json": "~0.0.0",
     "bower-registry-client": "~0.0.0",
     "chmodr": "~0.1.0",
@@ -27,6 +28,7 @@
     "fstream": "~0.1.22",
     "fstream-ignore": "0.0.6",
     "glob": "~3.2.1",
+    "graceful-fs": "~1.2.2",
     "handlebars": "~1.0.11",
     "junk": "~0.2.0",
     "mkdirp": "~0.3.5",
diff --git a/test/assets/downloader.js b/test/assets/downloader.js
index 21799f9c..e1f0687d 100644
--- a/test/assets/downloader.js
+++ b/test/assets/downloader.js
@@ -1,4 +1,4 @@
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var cmd = require('../../lib/util/cmd');
 
diff --git a/test/assets/test-temp-dir/test-exception.js b/test/assets/test-temp-dir/test-exception.js
index ed12060b..4d52031a 100644
--- a/test/assets/test-temp-dir/test-exception.js
+++ b/test/assets/test-temp-dir/test-exception.js
@@ -1,4 +1,4 @@
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Resolver = require('../../../lib/core/resolvers/Resolver');
 var Logger = require('../../../lib/core/Logger');
diff --git a/test/assets/test-temp-dir/test.js b/test/assets/test-temp-dir/test.js
index a3a0e79c..1cf5be81 100644
--- a/test/assets/test-temp-dir/test.js
+++ b/test/assets/test-temp-dir/test.js
@@ -1,4 +1,4 @@
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var Resolver = require('../../../lib/core/resolvers/Resolver');
 var Logger = require('../../../lib/core/Logger');
diff --git a/test/core/resolverFactory.js b/test/core/resolverFactory.js
index 65fbc1f9..766ef0d3 100644
--- a/test/core/resolverFactory.js
+++ b/test/core/resolverFactory.js
@@ -1,5 +1,5 @@
 var expect = require('expect.js');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var mkdirp = require('mkdirp');
 var mout = require('mout');
diff --git a/test/core/resolvers/fsResolver.js b/test/core/resolvers/fsResolver.js
index cf5918b5..69547359 100644
--- a/test/core/resolvers/fsResolver.js
+++ b/test/core/resolvers/fsResolver.js
@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var rimraf = require('rimraf');
 var mkdirp = require('mkdirp');
diff --git a/test/core/resolvers/gitFsResolver.js b/test/core/resolvers/gitFsResolver.js
index 3ab0b90b..d5f71015 100644
--- a/test/core/resolvers/gitFsResolver.js
+++ b/test/core/resolvers/gitFsResolver.js
@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var rimraf = require('rimraf');
 var cmd = require('../../../lib/util/cmd');
diff --git a/test/core/resolvers/gitRemoteResolver.js b/test/core/resolvers/gitRemoteResolver.js
index 0663921b..4e3de8a0 100644
--- a/test/core/resolvers/gitRemoteResolver.js
+++ b/test/core/resolvers/gitRemoteResolver.js
@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var GitRemoteResolver = require('../../../lib/core/resolvers/GitRemoteResolver');
 var Logger = require('../../../lib/core/Logger');
 var defaultConfig = require('../../../lib/config');
diff --git a/test/core/resolvers/gitResolver.js b/test/core/resolvers/gitResolver.js
index 1be13c24..64145c71 100644
--- a/test/core/resolvers/gitResolver.js
+++ b/test/core/resolvers/gitResolver.js
@@ -1,7 +1,7 @@
 var expect = require('expect.js');
 var util = require('util');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var chmodr = require('chmodr');
 var rimraf = require('rimraf');
 var mkdirp = require('mkdirp');
diff --git a/test/core/resolvers/resolver.js b/test/core/resolvers/resolver.js
index bd342a87..cd028f0c 100644
--- a/test/core/resolvers/resolver.js
+++ b/test/core/resolvers/resolver.js
@@ -1,5 +1,5 @@
 var expect = require('expect.js');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var util = require('util');
 var rimraf = require('rimraf');
diff --git a/test/core/resolvers/urlResolver.js b/test/core/resolvers/urlResolver.js
index 64e461b8..0f0acfd6 100644
--- a/test/core/resolvers/urlResolver.js
+++ b/test/core/resolvers/urlResolver.js
@@ -1,6 +1,6 @@
 var expect = require('expect.js');
 var path = require('path');
-var fs = require('fs');
+var fs = require('graceful-fs');
 var path = require('path');
 var nock = require('nock');
 var Q = require('q');