--- a/pvl/hosts/zone.py	Wed Feb 25 14:23:04 2015 +0200
+++ b/pvl/hosts/zone.py	Wed Feb 25 14:29:40 2015 +0200
@@ -14,7 +14,13 @@
         Resolve relative CNAME for label@origin -> alias@domain
     """
 
-    fqdn = pvl.dns.join(name, domain)
+    if origin:
+        origin = pvl.dns.fqdn(origin)
+    
+    if domain:
+        fqdn = pvl.dns.fqdn(name, domain)
+    else:
+        fqdn = pvl.dns.fqdn(name)
 
     if not origin:
         return fqdn