diff --git a/.gitignore b/.gitignore
index bca129da..c519f474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 ehthumbs.db
 Icon?
 Thumbs.db
+config/env/local.js
 
 # Node and related ecosystem
 # ==========================
diff --git a/config/config.js b/config/config.js
index ef4a4c2c..aa16f12e 100644
--- a/config/config.js
+++ b/config/config.js
@@ -11,7 +11,8 @@ var _ = require('lodash'),
  */
 module.exports = _.extend(
 	require('./env/all'),
-	require('./env/' + process.env.NODE_ENV) || {}
+	require('./env/' + process.env.NODE_ENV),
+	require('./env/local.js') || {}
 );
 
 /**