diff --git a/extra/tools/dns/dns.factor b/extra/tools/dns/dns.factor
index c3b6ad87e1..6abd13f7a0 100644
--- a/extra/tools/dns/dns.factor
+++ b/extra/tools/dns/dns.factor
@@ -6,10 +6,20 @@ IN: tools.dns
 : a-line. ( host ip -- )
     [ write " has address " write ] [ print ] bi* ;
 
+: aaaa-line. ( host ip -- )
+    [ write " has IPv6 address " write ] [ print ] bi* ;
+
 : a-message. ( message -- )
     [ message>query-name ] [ message>a-names ] bi
     [ a-line. ] with each ;
 
+: (aaaa-message.) ( message -- )
+    [ message>query-name ] [ message>aaaa-names ] bi
+    [ aaaa-line. ] with each ;
+
+: aaaa-message. ( message -- )
+    [ a-message. ] [ (aaaa-message.) ] bi ;
+
 : mx-line. ( host pair -- )
     [ write " mail is handled by " write ]
     [ first2 [ number>string write bl ] [ print ] bi* ] bi* ;
@@ -20,5 +30,5 @@ IN: tools.dns
 
 : host ( domain -- )
     [ dns-A-query a-message. ]
-    [ dns-AAAA-query a-message. ]
+    [ dns-AAAA-query aaaa-message. ]
     [ dns-MX-query mx-message. ] tri ;