diff --git a/lib/jekyll/command.rb b/lib/jekyll/command.rb
index eaf8ef44..2a4fc77f 100644
--- a/lib/jekyll/command.rb
+++ b/lib/jekyll/command.rb
@@ -55,6 +55,8 @@ module Jekyll
         c.option "limit_posts", "--limit_posts MAX_POSTS", Integer,
           "Limits the number of posts to parse and publish"
         c.option "watch", "-w", "--[no-]watch", "Watch for changes and rebuild"
+        c.option "baseurl", "-b", "--baseurl URL",
+          "Serve the website from the given base URL"
         c.option "force_polling", "--force_polling", "Force watch to use polling"
         c.option "lsi", "--lsi", "Use LSI for improved related posts"
         c.option "show_drafts", "-D", "--drafts", "Render posts in the _drafts folder"
diff --git a/lib/jekyll/commands/serve.rb b/lib/jekyll/commands/serve.rb
index 6f1c4a40..9042a4a0 100644
--- a/lib/jekyll/commands/serve.rb
+++ b/lib/jekyll/commands/serve.rb
@@ -9,7 +9,6 @@ module Jekyll
           "detach"             => ["-B", "--detach", "Run the server in the background"],
           "ssl_key"            => ["--ssl-key [KEY]", "X.509 (SSL) Private Key."],
           "port"               => ["-P", "--port [PORT]", "Port to listen on"],
-          "baseurl"            => ["-b", "--baseurl [URL]", "Base URL"],
           "show_dir_listing"   => ["--show-dir-listing",
             "Show a directory listing instead of loading your index file."],
           "skip_initial_build" => ["skip_initial_build", "--skip-initial-build",