diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000000000..b0b9a96ef0ecd
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "stage": 0
+}
diff --git a/bin/gatsby-build.js b/bin/gatsby-build.js
index 77050eccb55be..d2e6e0b63ac4d 100755
--- a/bin/gatsby-build.js
+++ b/bin/gatsby-build.js
@@ -1,5 +1,5 @@
 #!/usr/bin/env node
+require('babel/register');
 
 require('coffee-script/register');
 require('./build');
-
diff --git a/bin/gatsby-serve.js b/bin/gatsby-serve.js
index 476d7b4b77bdf..10581d0fd0a41 100755
--- a/bin/gatsby-serve.js
+++ b/bin/gatsby-serve.js
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+require('babel/register');
 
 require('coffee-script/register');
 require('./serve');
diff --git a/lib/loaders/config-loader/index.js b/lib/loaders/config-loader/index.js
index b46a585e2e63d..f6f4c27604cc5 100644
--- a/lib/loaders/config-loader/index.js
+++ b/lib/loaders/config-loader/index.js
@@ -23,7 +23,6 @@
     value.relativePath = path.relative('.', directory);
     return globPages(directory, function(err, pagesData) {
       value.pages = pagesData;
-      this.value = [value];
       return callback(null, 'module.exports = ' + JSON.stringify(value, void 0, "\t"));
     });
   };
diff --git a/lib/utils/glob-pages.coffee b/lib/utils/glob-pages.coffee
index 724c36f912fca..1688f0fc86d36 100644
--- a/lib/utils/glob-pages.coffee
+++ b/lib/utils/glob-pages.coffee
@@ -17,7 +17,7 @@ module.exports = (directory, callback) ->
 
   # Make this easy to add to through the config?
   # Or just keep adding extensions...?
-  glob directory + '/pages/**/?(*.coffee|*.cjsx|*.jsx|*.md|*.html)', null, (err, pages) =>
+  glob directory + '/pages/**/?(*.coffee|*.cjsx|*.jsx|*.js|*.md|*.html)', null, (err, pages) =>
     if err then return callback(err)
 
     for page in pages
@@ -83,4 +83,3 @@ module.exports = (directory, callback) ->
       pagesData.push pageData
 
     callback(null, pagesData)
-
diff --git a/package.json b/package.json
index 9e3d1cf0471e8..be83b23970840 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "async": "^1.2.1",
+    "babel": "^5.8.23",
     "babel-core": "^5.5.8",
     "babel-loader": "^5.1.4",
     "boom": "^2.7.2",