diff --git a/examples/vuex-store/README.md b/examples/vuex-store/README.md
index 0932cd9eb0..4bf9cbec9e 100644
--- a/examples/vuex-store/README.md
+++ b/examples/vuex-store/README.md
@@ -2,21 +2,13 @@
 
 > Using a store to manage the state is important to every big application, that's why nuxt.js implement Vuex in its core.
 
-## Activate the store option
+## Activating the store
 
-First, we need to tell nuxt.js to activate the store, for this, we add a `nuxt.config.js` file:
-
-```js
-module.exports = {
-  store: true
-}
-```
+Nuxt.js will try to `require('./store/index.js')`, if exists, it will import `Vuex`, add it to the vendors and add the `store` option to the root `Vue` instance.
 
 ## Create the store folder
 
-When the store option is activated, nuxt will import it via `require('./store')`
-
-After creating the `store/` folder, we can create our `store/index.js` file:
+Let's create a file `store/index.js`:
 
 ```js
 import Vue from 'vue'
@@ -38,11 +30,11 @@ const store = new Vuex.Store({
 export default store
 ```
 
-> You don't need to install vuex since it's shipped with nuxt.js
+> We don't need to install `Vuex` since it's shipped with nuxt.js
 
 ## Voilà !
 
-You're ready to use `this.$store` inside your `.vue` files :)
+We can now use `this.$store` inside our `.vue` files.
 
 ```html
 <template>
@@ -56,7 +48,7 @@ You're ready to use `this.$store` inside your `.vue` files :)
 
 The `fetch` method, *if set*, is called every time before loading the component (*only if attached to a route*). It can be called from the server-side or before navigating to the corresponding route.
 
-The `fetch` method receives the context as the first argument, you can use it to fetch some data and fill the store. To make the fetch method asynchronous, **return a Promise**, nuxt.js will wait for the promise to be resolved before rendering the Component.
+The `fetch` method receives the context as the first argument, we can use it to fetch some data and fill the store. To make the fetch method asynchronous, **return a Promise**, nuxt.js will wait for the promise to be resolved before rendering the Component.
 
 For example:
 ```js
@@ -76,7 +68,7 @@ To see the list of available keys in `context`, take a look at [this documentati
 
 ## Action `nuxtServerInit`
 
-If you define the action `nuxtServerInit` in your store, nuxt.js will call it with the context, it can be useful when having some data on the server you want to give to the client-side, for example, the authenticated user:
+If we define the action `nuxtServerInit` in our store, Nuxt.js will call it with the context. It can be useful when having some data on the server we want to give directly to the client-side, for example, the authenticated user:
 ```js
 // store/index.js
 actions: {
diff --git a/lib/app/index.js b/lib/app/index.js
index 1327152430..6ee2d7d88b 100644
--- a/lib/app/index.js
+++ b/lib/app/index.js
@@ -4,8 +4,8 @@
 // (runtime-only or standalone) has been set in webpack.base.conf with an alias.
 import Vue from 'vue'
 import Meta from 'vue-meta/lib/vue-meta.js' // require the ES2015 lib
-import router from './router'
-<% if (store) { %>import store from '~store'<% } %>
+import router from './router.js'
+<% if (store) { %>import store from '~store/index.js'<% } %>
 
 Vue.use(Meta, {
   keyName: 'head', // the component option name that vue-meta looks for meta info on.
diff --git a/lib/build/index.js b/lib/build/index.js
index b8efd60d97..f80038010e 100644
--- a/lib/build/index.js
+++ b/lib/build/index.js
@@ -84,14 +84,6 @@ module.exports = function * () {
     }
     process.exit(1)
   }
-  if (this.options.store && !fs.existsSync(join(this.dir, 'store'))) {
-    console.error('> No `store` directory found (store option activated). Please create on under the project root')
-    process.exit(1)
-  }
-  if (this.options.store && !fs.existsSync(join(this.dir, 'store', 'index.js'))) {
-    console.error('> No `store/index.js` file found (store option activated). Please create the file.')
-    process.exit(1)
-  }
   debug(`App root: ${this.dir}`)
   debug('Generating .nuxt/ files...')
   /*
diff --git a/lib/nuxt.js b/lib/nuxt.js
index 8997b7c40f..1c0a256326 100644
--- a/lib/nuxt.js
+++ b/lib/nuxt.js
@@ -10,7 +10,7 @@ const serialize = require('serialize-javascript')
 const build = require('./build')
 const generate = require('./generate')
 const serveStatic = require('serve-static')
-const { resolve } = require('path')
+const { resolve, join } = require('path')
 const { urlJoin } = require('./utils')
 const { encodeHtml, getContext, setAnsiColors } = require('./utils')
 setAnsiColors(ansiHTML)
@@ -27,7 +27,6 @@ class Nuxt {
       head: {},
       plugins: [],
       css: [],
-      store: false,
       cache: false,
       loading: {
         color: 'black',
@@ -51,6 +50,10 @@ class Nuxt {
     // Env variables
     this.dev = this.options.dev
     this.dir = (typeof options.rootDir === 'string' && options.rootDir ? options.rootDir : process.cwd())
+    // If store defined, update store options to true
+    if (fs.existsSync(join(this.dir, 'store', 'index.js'))) {
+      this.options.store = true
+    }
     // Template
     this.appTemplate = _.template(fs.readFileSync(resolve(__dirname, 'views', 'app.html'), 'utf8'), {
       imports: { serialize }
diff --git a/package.json b/package.json
index 38aee3914a..e73d367ac7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nuxt",
-  "version": "0.4.7",
+  "version": "0.4.8",
   "description": "A minimalistic framework for server-rendered Vue.js applications (inspired by Next.js)",
   "main": "index.js",
   "license": "MIT",