diff --git a/collectd/files/collectd.conf b/collectd/files/collectd.conf
index 825e4b0..0a4223e 100644
--- a/collectd/files/collectd.conf
+++ b/collectd/files/collectd.conf
@@ -7,8 +7,11 @@
 # Modify the config that generates this file instead
 #
 
+{% if collectd_settings.Hostname is defined and collectd_settings.Hostname -%}
 Hostname "{{ collectd_settings.Hostname }}"
-FQDNLookup {{ collectd_settings.FQDNLookup }}
+{% else -%}
+FQDNLookup "{{ collectd_settings.FQDNLookup|lower }}"
+{% endif -%}
 #BaseDir "/var/lib/collectd"
 #PluginDir "/usr/lib/collectd"
 
diff --git a/collectd/map.jinja b/collectd/map.jinja
index 4290994..212916d 100644
--- a/collectd/map.jinja
+++ b/collectd/map.jinja
@@ -35,14 +35,13 @@
 {# Settings dictionary with default values #}
 {% set default_settings = {
     'collectd': {
-        'Hostname': salt['grains.get']('fqdn'),
         'Interval': 10,
         'Timeout': 2,
         'ReadThreads': 5,
         'WriteQueueLimitHigh': 2000000,
         'WriteQueueLimitLow': 1800000,
         'CollectInternalStats': 'false',
-        'FQDNLookup': 'false',
+        'FQDNLookup': 'true',
         'plugins': {
             'default': [
                 'battery',
diff --git a/pillar.example b/pillar.example
index 13a2e8c..4ecb526 100644
--- a/pillar.example
+++ b/pillar.example
@@ -1,5 +1,8 @@
 collectd:
-  FQDNLookup: true
+  # This line restores the old behaviour, comment it out to use the system's hostname
+  Hostname: {{ salt['grains.get']('fqdn') }}
+  # If Hostname is not defined, whether collectd will try to figure it out as a FQDN (default: true)
+  FQDNLookup: false
   TypesDB: ['/usr/share/collectd/types.db']
   plugins:
     default: [battery, cpu, entropy, load, memory, swap, users]