diff --git a/bin/jekyll b/bin/jekyll
index b2c6fab9..f5d82931 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -17,7 +17,7 @@ default_command :help
 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_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
+global_option '-p', '--plugins PLUGINS_DIR1[,PLUGINS_DIR2[,...]]', Array, 'Plugins directory (defaults to ./_plugins)'
 global_option '--layouts', 'Layouts directory (defaults to ./_layouts)'
 
 # Option names don't always directly match the configuration value we'd like.
@@ -73,8 +73,8 @@ command :serve do |c|
   c.option '--lsi', 'Use LSI for improved related posts'
   c.option '--drafts', 'Render posts in the _drafts folder'
 
-  c.option '-p', '--port [PORT]', 'Port to listen on'
-  c.option '-h', '--host [HOST]', 'Host to bind to'
+  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|