diff --git a/lib/jekyll/configuration.rb b/lib/jekyll/configuration.rb
index f0617744..0810276f 100644
--- a/lib/jekyll/configuration.rb
+++ b/lib/jekyll/configuration.rb
@@ -8,8 +8,12 @@ module Jekyll
       'destination'   => File.join(Dir.pwd, '_site'),
       'plugins'       => '_plugins',
       'layouts'       => '_layouts',
-      'keep_files'   => ['.git','.svn'],
+      'keep_files'    => ['.git','.svn'],
 
+      'safe'          => false,
+      'show_drafts'   => nil,
+      'limit_posts'   => nil,
+      'lsi'           => false,
       'future'        => true,           # remove and make true just default
       'pygments'      => true,           # remove and make true just default
 
@@ -17,6 +21,7 @@ module Jekyll
       'permalink'     => 'date',
       'baseurl'       => '/',
       'include'       => ['.htaccess'],
+      'exclude'       => [],
       'paginate_path' => 'page:num',
 
       'markdown_ext'  => 'markdown,mkd,mkdn,md',
diff --git a/lib/jekyll/site.rb b/lib/jekyll/site.rb
index 6e23edf4..1354cb67 100644
--- a/lib/jekyll/site.rb
+++ b/lib/jekyll/site.rb
@@ -23,12 +23,12 @@ module Jekyll
       self.pygments        = config['pygments']
       self.baseurl         = config['baseurl']
       self.permalink_style = config['permalink'].to_sym
-      self.exclude         = config['exclude'] || []
-      self.include         = config['include'] || []
+      self.exclude         = config['exclude']
+      self.include         = config['include']
       self.future          = config['future']
-      self.show_drafts     = config['show_drafts'] || nil
-      self.limit_posts     = config['limit_posts'] || nil
-      self.keep_files      = config['keep_files'] || []
+      self.show_drafts     = config['show_drafts']
+      self.limit_posts     = config['limit_posts']
+      self.keep_files      = config['keep_files']
 
       self.reset
       self.setup