--- draft-schlitt-spf-classic-02.xml	2005-06-06 19:15:47.000000000 +0000
+++ draft-schlitt-spf-classic-02+ipv6-handling.xml	2006-01-11 23:06:20.000000000 +0000
@@ -997,9 +997,13 @@
         When any mechanism fetches host addresses to compare with
         <ip>, when <ip> is an IPv4 address, A records are
         fetched, when <ip> is an IPv6 address, AAAA records are
-        fetched.  Even if the SMTP connection is via IPv6, an
-        IPv4-mapped IPv6 IP address (see <xref target="RFC3513"/>
-        section 2.5.5) MUST still be considered an IPv4 address.
+        fetched.  For SPF clients supporting IPv6, it is recommended that
+        it internally operates on IPv6 addresses only, and that it
+        converts any IPv4 addresses to IPv4-mapped IPv6 addresses
+        (::ffff:n.n.n.n, see <xref target="RFC3513"/> section 2.5.5)
+        internally. However, the client MUST still match any such
+        ::ffff:n.n.n.n addresses against n.n.n.n addresses in SPF records
+        and format them as n.n.n.n addresses when generating output text.
       </t>
       <t>
         Several mechanisms rely on information fetched from DNS.  For