diff --git a/spy.go b/spy.go
index 096c4ee..0d38745 100644
--- a/spy.go
+++ b/spy.go
@@ -46,7 +46,12 @@ func (s *Spy) mutateContainerInCache(id string, status string) {
 		return
 	}
 
-	name := container.Config.Hostname + "." + container.Config.Domainname + "."
+        domain := container.Config.Domainname + "."
+        if domain == "." {
+            domain = s.dns.domain
+        }
+
+	name := container.Config.Hostname + "." + domain
 
 	var running = regexp.MustCompile("start|^Up.*$")
 	var stopping = regexp.MustCompile("die")