diff --git a/templates/collectd.conf.erb b/templates/collectd.conf.erb
index 3128790ce..281bb7fb7 100644
--- a/templates/collectd.conf.erb
+++ b/templates/collectd.conf.erb
@@ -1,6 +1,6 @@
 # Generated by Puppet
 <% unless @fqdnlookup %>
-Hostname <%= @collectd_hostname %>
+Hostname "<%= @collectd_hostname %>"
 FQDNLookup false
 <% else %>
 #Hostname localhost