diff --git a/History.txt b/History.txt
index ce2355dc..c1dd391a 100644
--- a/History.txt
+++ b/History.txt
@@ -3,6 +3,7 @@
     * Add wordpress.com importer (#207)
     * Add --limit-posts cli option (#212)
     * Add uri_escape filter (#234)
+    * Add --base-url cli option (#235)
   * Bug Fixes
     * Fixed filename basename generation (#208)
 
diff --git a/bin/jekyll b/bin/jekyll
index ffbe4f08..62d88e1a 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -40,7 +40,7 @@ opts = OptionParser.new do |opts|
     options['server_port'] = port unless port.nil?
   end
 
-  opts.on("--baseurl [BASE_URL]", "Serve website from a given base URL (default '/'") do |baseurl|
+  opts.on("--base-url [BASE_URL]", "Serve website from a given base URL (default '/'") do |baseurl|
       options['baseurl'] = baseurl
   end
 
@@ -92,7 +92,6 @@ opts = OptionParser.new do |opts|
     end
   end
 
-
   opts.on("--url [URL]", "Set custom site.url") do |url|
     options['url'] = url
   end