diff --git a/bin/jekyll2 b/bin/jekyll2
index d99ba866..eba186dd 100755
--- a/bin/jekyll2
+++ b/bin/jekyll2
@@ -11,8 +11,11 @@ program :version, Jekyll::VERSION
 program :description, 'Jekyll is a blog-aware, static site generator in Ruby'
 
 # Global options available to every command
-global_option '-s', '--source DIR', String, 'Source directory'
-global_option '-d', '--destination DIR', String, 'Destination directory'
+global_option '-s', '--source [DIR]', 'Source directory (defaults to ./)'
+global_option '-d', '--destination [DIR]', 'Destination directory (defaults to ./_site)'
+global_option '--safe', 'Safe mode (defaults to false)'
+global_option '--plugins', 'Plugins directory (defaults to ./_plugins)'
+global_option '--layouts', 'Layouts directory (defaults to ./_layouts)'
 
 # Build command
 #
@@ -22,10 +25,9 @@ global_option '-d', '--destination DIR', String, 'Destination directory'
 #   --watch
 command :build do |c|
   c.syntax = 'jekyll build [options]'
-  c.description = 'Build...'
+  c.description = 'Build your site with the option of auto-renegeration'
   c.option '-w', '--watch', 'Watch for changes and rebuild'
   c.action do |args, options|
-    options.default :watch => false
     Jekyll::BuildCommand.process(options)
   end
 end
@@ -42,14 +44,13 @@ end
 #   --baseurl
 command :serve do |c|
   c.syntax = 'jekyll serve [options]'
-  c.description = 'Serve...'
+  c.description = 'Serve your site locally with the option of auto-regeneration'
   c.option '-w', '--watch', 'Watch for changes and rebuild'
   c.option '-p', '--port [PORT]', 'Port to listen on'
   c.option '-h', '--host [HOST]', 'Host to bind to'
   c.option '-b', '--baseurl [URL]', 'Base URL'
   c.action do |args, options|
-    options.default :watch => false,
-                    :port => '4000',
+    options.default :port => '4000',
                     :host => '0.0.0.0',
                     :baseurl => '/',
                     :serving => true