diff --git a/puppet/manifests/init.pp b/puppet/manifests/init.pp
index efd2066..662c7bf 100644
--- a/puppet/manifests/init.pp
+++ b/puppet/manifests/init.pp
@@ -5,6 +5,10 @@ class puppet::client {
 
     tag("bootstrap")
     
+    if ! $puppet_server {
+        $puppet_server = "puppet"
+    }
+
     case $operatingsystem {
         openbsd: { $vardir = "/var/puppet" }
         default: { $vardir = "/var/lib/puppet" }
diff --git a/puppet/templates/puppet.conf.erb b/puppet/templates/puppet.conf.erb
index d6eb211..540fb8f 100644
--- a/puppet/templates/puppet.conf.erb
+++ b/puppet/templates/puppet.conf.erb
@@ -23,6 +23,11 @@
     path = /sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
 
 <% end -%>
+    # The server to which server puppetd should connect
+    # The default value is 'puppet'. Explicitly set to support
+    # re-installs on remote networks.
+    server = <%= puppet_server %>
+
     # Enable sending reports to puppet server.
     report = true