2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 81fe9f86c..120568834 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,7 @@
 0.22.2 (grover)
+    The bind address for puppetmasterd can now be specified with 
+    --bindaddress.
+
     Added (probably experimental) mongrel support.  At this point you're
     still responsible for starting each individual process, and you have to
     set up a proxy in front of it.
diff --git a/bin/puppetmasterd b/bin/puppetmasterd
index e0c6434ba..98db576fd 100755
--- a/bin/puppetmasterd
+++ b/bin/puppetmasterd
@@ -252,7 +252,11 @@ begin
     when "mongrel":
         require 'puppet/network/server/mongrel'
         handler = Puppet::Network::Server::MongrelHandler.new(handlers)
-        server = Mongrel::HttpServer.new("0.0.0.0", Puppet[:masterport])
+        addr = Puppet[:bindaddress]
+        if addr == ""
+            addr =  "127.0.0.1"
+        end
+        server = Mongrel::HttpServer.new(addr, Puppet[:masterport])
         server.register("/", handler)
     else
         Puppet.err "Invalid server type %s" % Puppet[:servertype]