diff --git a/History.txt b/History.txt
index cd8f9adf..b77859f1 100644
--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,7 @@
+== HEAD
+  * Bug Fixes
+    * Add --no-server option.
+
 == 0.9.0 / 2010-12-15
   * Minor Enhancements
     * Use OptionParser's [no-] functionality for better boolean parsing.
diff --git a/bin/jekyll b/bin/jekyll
index 060060ee..984aa43b 100755
--- a/bin/jekyll
+++ b/bin/jekyll
@@ -36,6 +36,10 @@ opts = OptionParser.new do |opts|
     options['server_port'] = port unless port.nil?
   end
 
+  opts.on("--no-server", "Do not start a web server") do |part|
+    options['server'] = false
+  end
+
   opts.on("--base-url [BASE_URL]", "Serve website from a given base URL (default '/'") do |baseurl|
       options['baseurl'] = baseurl
   end