diff --git a/lib/middleman.rb b/lib/middleman.rb
index b763205e..49f59061 100755
--- a/lib/middleman.rb
+++ b/lib/middleman.rb
@@ -163,6 +163,7 @@ module Middleman
     def start_server(options={})
       opts = {
         :Port      => options[:port] || 4567,
+        :Host      => options[:host] || "0.0.0.0",
         :AccessLog => []
       }
     
diff --git a/lib/middleman/cli.rb b/lib/middleman/cli.rb
index 2218b13f..ac0ff6f5 100644
--- a/lib/middleman/cli.rb
+++ b/lib/middleman/cli.rb
@@ -53,6 +53,12 @@ module Middleman
       :aliases => "-e", 
       :default => ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development', 
       :desc    => "The environment Middleman will run under"
+      method_option :host,
+        :type => :string,
+        :aliases => "-h",
+        # :required => true,
+        :default => "0.0.0.0", 
+        :desc => "Bind to HOST address"
     method_option "port",
       :aliases => "-p", 
       :default => "4567", 
@@ -64,6 +70,7 @@ module Middleman
     def server
       params = {
         :port        => options["port"],
+        :host        => options["host"],
         :environment => options["environment"],
         :debug       => options["debug"]
       }