diff --git a/bin/jekyll b/bin/jekyll
index 5d3b229b..1c3324ba 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -75,10 +75,7 @@ command :serve do |c|
   c.option '-b', '--baseurl [URL]', 'Base URL'
 
   c.action do |args, options|
-    options.default :port => '4000',
-                    :host => '0.0.0.0',
-                    :baseurl => '/',
-                    :serving => true
+    options.default :serving => true
 
     options = normalize_options(options.__hash__)
     options = Jekyll.configuration(options)
diff --git a/lib/jekyll.rb b/lib/jekyll.rb
index b7c711e8..19ad0373 100644
--- a/lib/jekyll.rb
+++ b/lib/jekyll.rb
@@ -64,17 +64,20 @@ module Jekyll
     'keep_files'   => ['.git','.svn'],
 
     'future'        => true,           # remove and make true just default
-    'pygments'      => true,          # remove and make true just default
+    'pygments'      => true,           # remove and make true just default
 
     'markdown'      => 'maruku',
     'permalink'     => 'date',
-    'baseurl'       => '',
+    'baseurl'       => '/',
     'include'       => ['.htaccess'],
     'paginate_path' => 'page:num',
 
     'markdown_ext'  => 'markdown,mkd,mkdn,md',
     'textile_ext'   => 'textile',
 
+    'port'          => '4000',
+    'host'          => '0.0.0.0',
+
     'excerpt_separator' => "\n\n",
 
     'maruku' => {