diff --git a/lib/app/router.js b/lib/app/router.js
index 8312556090..efad4256db 100644
--- a/lib/app/router.js
+++ b/lib/app/router.js
@@ -60,6 +60,8 @@ export function createRouter () {
     routes: [
 <%= _routes %>
     ],
+    <% if (router.parseQuery) { %>parseQuery: <%= serialize(router.parseQuery).replace('parseQuery(', 'function(') %>,<% } %>
+    <% if (router.stringifyQuery) { %>stringifyQuery: <%= serialize(router.stringifyQuery).replace('stringifyQuery(', 'function(') %>,<% } %>
     fallback: <%= router.fallback %>
   })
 }
diff --git a/lib/common/options.js b/lib/common/options.js
index 17e3fd6532..c767c8a91d 100755
--- a/lib/common/options.js
+++ b/lib/common/options.js
@@ -274,6 +274,8 @@ Options.defaults = {
     linkExactActiveClass: 'nuxt-link-exact-active',
     extendRoutes: null,
     scrollBehavior: null,
+    parseQuery: false,
+    stringifyQuery: false,
     fallback: false
   },
   render: {