diff --git a/lib/commands/serve.js b/lib/commands/serve.js
index <HASH>..<HASH> 100644
--- a/lib/commands/serve.js
+++ b/lib/commands/serve.js
@@ -110,11 +110,11 @@ module.exports = {
       .then(hook.prepare('beforeBuild'))
       .then(this._autoFindLiveReloadPort.bind(this, options))
       .then(function(serveOpts) {
-        var baseURL = this.project.config.baseURL;
-        if (baseURL === undefined) { baseURL = '/'; }
+        var config = this.project.config();
 
         _merge(serveOpts, {
-          baseURL: this.project.config().baseURL,
+          baseURL: config.baseURL,
+          rootURL: config.rootURL,
           project: this.project
         });
fix(serve-task #<I>): support rootURL