diff --git a/bin/jekyll b/bin/jekyll
index cf7d1eec..de5b51d3 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -121,10 +121,12 @@ command :docs do |c|
   c.option '-u', '--host [HOST]', 'Host to bind to'
 
   c.action do |args, options|
-    options = Jekyll.configuration(normalize_options(options.__hash__).merge!({
+    options = normalize_options(options.__hash__)
+    options = options.merge({
       'source' => File.expand_path("../site", File.dirname(__FILE__)),
       'destination' => File.expand_path("../site/_site", File.dirname(__FILE__))
-    }))
+    })
+    options = Jekyll.configuration(options)
     puts options
     Jekyll::Commands::Build.process(options)
     Jekyll::Commands::Serve.process(options)