diff --git a/manifests/nameresolution.pp b/manifests/nameresolution.pp
index 0edd713..48dfb91 100644
--- a/manifests/nameresolution.pp
+++ b/manifests/nameresolution.pp
@@ -9,8 +9,15 @@ class kickstack::nameresolution inherits kickstack {
 
   case $::kickstack::name_resolution {
     'hosts': {
-      @@host { $hostname:
+      $host = pick($fqdn,$hostname)
+      if $fqdn {
+        $aliases = [ $hostname ]
+      } else {
+        $aliases = []
+      }
+      @@host { $host:
         ip => getvar("ipaddress_${::kickstack::nic_management}"),
+        host_aliases => $aliases,
         comment => 'Managed by Puppet',
         tag => 'hostname'
       }