Index: /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 19357)
+++ /trunk/src/org/openstreetmap/josm/data/validation/routines/DomainValidator.java	(revision 19358)
@@ -899,5 +899,5 @@
         "media", // media Binky Moon, LLC
         "meet", // meet Charleston Road Registry Inc.
-        "melbourne", // melbourne The Crown in right of the State of Victoria, represented by its Department of State Development, Business and Innovation
+        "melbourne", // melbourne The Crown in right of the State of Victoria, Department of State Development, Business and Innovation
         "meme", // meme Charleston Road Registry Inc.
         "memorial", // memorial Dog Beach, LLC
Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java	(revision 19357)
+++ /trunk/test/unit/org/openstreetmap/josm/data/validation/routines/DomainValidatorTestIT.java	(revision 19358)
@@ -126,7 +126,9 @@
                         String comment = info[1].replaceAll(""","\"").replaceAll("'","'").replaceAll("&","&");
                         if ("country-code".equals(type)) { // Which list to use?
-                            allCC.put(asciiTld, unicodeTld + " " + comment);
-                            if (generateUnicodeTlds) {
-                                allCC.put(unicodeTld, asciiTld + " " + comment);
+                            if (!dv.isValidInfrastructureTld(asciiTld)) {
+                                allCC.put(asciiTld, unicodeTld + " " + comment);
+                                if (generateUnicodeTlds) {
+                                    allCC.put(unicodeTld, asciiTld + " " + comment);
+                                }
                             }
                         } else {