diff --git a/package.json b/package.json
index 8f1d8129a..4f7be7832 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,8 @@
     "coffee-cache": "0.1.0",
     "pegjs": "0.7.0",
     "async": "0.2.6",
-    "plist": "git://github.com/nathansobo/node-plist.git"
+    "plist": "git://github.com/nathansobo/node-plist.git",
+    "nak": "0.2.4"
   },
 
   "private": true,
diff --git a/src/app/project.coffee b/src/app/project.coffee
index d6651e727..a3da8a483 100644
--- a/src/app/project.coffee
+++ b/src/app/project.coffee
@@ -192,8 +192,9 @@ class Project
         readPath(line) if state is 'readingPath'
         readLine(line) if state is 'readingLines'
 
-    command = require.resolve('ag')
-    args = ['--ackmate', regex.source, @getPath()]
+    command = require.resolve 'nak'
+    args = ['--ackmate', "#{regex.source}", @getPath()]
+    args.unshift("--addVCSIgnores") if config.get('nak.addVCSIgnores')
     new BufferedProcess({command, args, stdout, exit})
     deferred