1 files changed, 5 insertions, 1 deletions
diff --git a/lib/puppet/daemon.rb b/lib/puppet/daemon.rb
index 26704af88..13caf4541 100755
--- a/lib/puppet/daemon.rb
+++ b/lib/puppet/daemon.rb
@@ -51,7 +51,11 @@ module Puppet
             unless defined? @fqdn and @fqdn
                 hostname = Facter.value("hostname")
                 domain = Facter.value("domain")
-                @fqdn = [hostname, domain].join(".")
+                if !domain || domain.empty? then
+                    @fqdn = hostname
+                else
+                    @fqdn = [hostname, domain].join(".")
+                end
             end
             return @fqdn
         end