diff --git a/httpd-core.scm b/httpd-core.scm
index f6f59c8..4dc1f05 100644
--- a/httpd-core.scm
+++ b/httpd-core.scm
@@ -500,7 +500,9 @@ the requested method (~A).~%"
 
 (define (my-fqdn addr)
   (or *my-fqdn*
-      (host-info:name (host-info addr))))
+      (begin 
+	(set-my-fqdn! (host-info:name (host-info addr)))
+	*my-fqdn*)))
 
 (define *my-fqdn* #f)
 (define (set-my-fqdn! fqdn)