diff --git a/bin/jekyll b/bin/jekyll
index 9fdfd3e4..4f543efa 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -14,7 +14,7 @@ def add_build_options(c)
   c.option 'limit_posts', '--limit_posts MAX_POSTS', Integer, 'Limits the number of posts to parse and publish'
   c.option 'watch',   '-w', '--watch', 'Watch for changes and rebuild'
   c.option 'lsi',     '--lsi', 'Use LSI for improved related posts'
-  c.option 'drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
+  c.option 'show_drafts',  '-D', '--drafts', 'Render posts in the _drafts folder'
   c.option 'verbose', '-V', '--verbose', 'Print verbose output.'
 end
 
@@ -67,7 +67,7 @@ Mercenary.program(:jekyll) do |p|
   p.command(:serve) do |c|
     c.syntax 'jekyll serve [options]'
     c.description 'Serve your site locally'
-    c.alias 'server'
+    c.alias :server
 
     add_build_options(c)
 
@@ -92,7 +92,6 @@ Mercenary.program(:jekyll) do |p|
     c.option '--config CONFIG_FILE[,CONFIG_FILE2,...]', Array, 'Custom configuration file'
 
     c.action do |args, options|
-      options = normalize_options(options.__hash__)
       options = Jekyll.configuration(options)
       Jekyll::Commands::Doctor.process(options)
     end