Index: draft-ietf-iri-3987bis.xml
===================================================================
--- draft-ietf-iri-3987bis.xml	(revision 19)
+++ draft-ietf-iri-3987bis.xml	(working copy)
@@ -1524,17 +1524,13 @@
 not subject to any scheme-based normalization; thus, two IRIs that
 differ only by the suffix "#" are considered different regardless of
 the scheme.</t>
-
-<t>((NOTE: THIS NEEDS TO BE UPDATED TO DEAL WITH IDNA8))
-Some IRI schemes may allow the usage of Internationalized Domain
-Names (IDN) <xref target="RFC3490"></xref> either in their ireg-name
-part or elsewhere. When in use in IRIs, those names SHOULD be
-validated by using the ToASCII operation defined in <xref
-target="RFC3490"></xref>, with the flags "UseSTD3ASCIIRules" and
-"AllowUnassigned". An IRI containing an invalid IDN cannot
-successfully be resolved.  Validated IDN components of IRIs SHOULD be
-character normalized by using the Nameprep process <xref
-target="RFC3491"></xref>; however, for legibility purposes, they
+  
+<t>Some IRI schemes allow the usage of Internationalized Domain
+Names (IDN) <xref target='RFC5890'></xref> either in their ireg-name
+part or elswhere. When in use in IRIs, those names SHOULD
+conform to the definition of U-Label in <xref
+target='RFC5890'></xref>. An IRI containing an invalid IDN cannot
+successfully be resolved. For legibility purposes, they
 SHOULD NOT be converted into ASCII Compatible Encoding (ACE).</t>
 
 <t>Scheme-based normalization may also consider IDN