diff --git a/bin/jekyll b/bin/jekyll
index 5d3b229b..ccf5b5ef 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -77,7 +77,6 @@ command :serve do |c|
   c.action do |args, options|
     options.default :port => '4000',
                     :host => '0.0.0.0',
-                    :baseurl => '/',
                     :serving => true
 
     options = normalize_options(options.__hash__)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index b7c711e8..8d10746c 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -68,7 +68,7 @@ module Jekyll
 
     'markdown'      => 'maruku',
     'permalink'     => 'date',
-    'baseurl'       => '',
+    'baseurl'       => '/',
     'include'       => ['.htaccess'],
     'paginate_path' => 'page:num',