diff --git a/History.markdown b/History.markdown
index e5fb00e8..349bc7e4 100644
--- a/History.markdown
+++ b/History.markdown
@@ -7,6 +7,7 @@
 ### Bug Fixes
 
 * Correct use of `url` and `baseurl` in the site template. (#2317)
+* Default `baseurl` to `""` (#2317)
 
 ### Development Fixes
 
diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index 7089c779..0c68365a 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -32,7 +32,7 @@ module Jekyll
       'markdown'      => 'kramdown',
       'highlighter'   => 'pygments',
       'permalink'     => 'date',
-      'baseurl'       => '/',
+      'baseurl'       => '',
       'include'       => ['.htaccess'],
       'exclude'       => [],
       'paginate_path' => '/page:num',