--- a/pvl/hosts/host.py	Tue Feb 24 21:36:53 2015 +0200
+++ b/pvl/hosts/host.py	Tue Feb 24 21:37:36 2015 +0200
@@ -1,7 +1,7 @@
 import collections
 import ipaddr
 import logging; log = logging.getLogger('pvl.hosts.host')
-import pvl.dns.zone
+import pvl.dns
 
 class HostError (Exception):
     def __init__(self, name, error):
@@ -184,12 +184,10 @@
             return ipaddr.IPAddress(0)
 
     def fqdn (self) :
-        if '.' in self.name:
-            return self.name + '.'
-        elif self.domain :
-            return pvl.dns.zone.fqdn(self.name, self.domain)
+        if self.domain :
+            return pvl.dns.fqdn(self.name, self.domain)
         else :
-            raise ValueError("%s: have no fqdn/domain" % (self, ))
+            return pvl.dns.fqdn(self.name)
     
     def __str__ (self) :
         return "{self.name}@{self.domain}".format(self=self)