diff --git a/src/app/text-mate-bundle.coffee b/src/app/text-mate-bundle.coffee
index 09f9de372..d63c57f6f 100644
--- a/src/app/text-mate-bundle.coffee
+++ b/src/app/text-mate-bundle.coffee
@@ -11,7 +11,12 @@ class TextMateBundle
   @bundles: []
 
   @loadAll: ->
-    for bundlePath in fs.list(require.resolve("bundles"))
+    globalBundles = fs.list(require.resolve("bundles"))
+
+    localBundlePath = fs.join(atom.configDirPath, "bundles")
+    localBundles = fs.list(localBundlePath) if fs.exists(localBundlePath)
+
+    for bundlePath in globalBundles.concat(localBundles ? [])
       @registerBundle(new TextMateBundle(bundlePath))
 
   @registerBundle: (bundle)->