diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi
index fec3350312c..9bd5b410ead 100644
--- a/doc/misc/nxml-mode.texi
+++ b/doc/misc/nxml-mode.texi
@@ -832,3 +832,7 @@ full Unicode support, which should improve the situation here.
 @end itemize
 
 @bye
+
+@ignore
+   arch-tag: 3b6e8ac2-ae8d-4f38-bd43-ce9f80be04d6
+@end ignore
diff --git a/etc/schema/schemas.xml b/etc/schema/schemas.xml
index e17b063f6fe..1eef7639540 100644
--- a/etc/schema/schemas.xml
+++ b/etc/schema/schemas.xml
@@ -34,3 +34,6 @@
   <typeId id="DocBook" uri="docbook.rnc"/>
   <typeId id="RDF" uri="rdfxml.rnc"/>
 </locatingRules>
+
+<!-- arch-tag: 1fde96fa-b401-4033-8514-c4990b1e18a5
+     (do not change this comment) -->
diff --git a/lisp/nxml/char-name/unicode/00000-0007F.el b/lisp/nxml/char-name/unicode/00000-0007F.el
index 122804fc47a..da2be08938c 100644
--- a/lisp/nxml/char-name/unicode/00000-0007F.el
+++ b/lisp/nxml/char-name/unicode/00000-0007F.el
@@ -95,3 +95,5 @@
     ("RIGHT CURLY BRACKET" #x007D)
     ("TILDE" #x007E)
     ))
+
+;; arch-tag: c46ffe15-ef5b-46f6-837f-d6bcf56db5b2
diff --git a/lisp/nxml/char-name/unicode/00080-000FF.el b/lisp/nxml/char-name/unicode/00080-000FF.el
index 1d7f463d56f..61fd8e0a4b0 100644
--- a/lisp/nxml/char-name/unicode/00080-000FF.el
+++ b/lisp/nxml/char-name/unicode/00080-000FF.el
@@ -96,3 +96,5 @@
     ("LATIN SMALL LETTER THORN" #x00FE)
     ("LATIN SMALL LETTER Y WITH DIAERESIS" #x00FF)
     ))
+
+;; arch-tag: f7ca0f06-9eb7-4b7a-b014-795af10f23ac
diff --git a/lisp/nxml/char-name/unicode/00100-0017F.el b/lisp/nxml/char-name/unicode/00100-0017F.el
index 7a97964a161..5c15ef91dfb 100644
--- a/lisp/nxml/char-name/unicode/00100-0017F.el
+++ b/lisp/nxml/char-name/unicode/00100-0017F.el
@@ -128,3 +128,5 @@
     ("LATIN SMALL LETTER Z WITH CARON" #x017E)
     ("LATIN SMALL LETTER LONG S" #x017F)
     ))
+
+;; arch-tag: 30e6e868-1bc7-4cd1-b75b-7fd4354cf8fe
diff --git a/lisp/nxml/char-name/unicode/00180-0024F.el b/lisp/nxml/char-name/unicode/00180-0024F.el
index 6a6a7ff3c18..5bc138be499 100644
--- a/lisp/nxml/char-name/unicode/00180-0024F.el
+++ b/lisp/nxml/char-name/unicode/00180-0024F.el
@@ -179,3 +179,5 @@
     ("LATIN CAPITAL LETTER Y WITH MACRON" #x0232)
     ("LATIN SMALL LETTER Y WITH MACRON" #x0233)
     ))
+
+;; arch-tag: d2a4e7e0-0d3a-4a29-994e-f5d0ed62cea2
diff --git a/lisp/nxml/char-name/unicode/00250-002AF.el b/lisp/nxml/char-name/unicode/00250-002AF.el
index 84814214f50..62ffa630e96 100644
--- a/lisp/nxml/char-name/unicode/00250-002AF.el
+++ b/lisp/nxml/char-name/unicode/00250-002AF.el
@@ -94,3 +94,5 @@
     ("LATIN LETTER BILABIAL PERCUSSIVE" #x02AC)
     ("LATIN LETTER BIDENTAL PERCUSSIVE" #x02AD)
     ))
+
+;; arch-tag: edc50b43-a94e-48db-91c5-0f9ea113c93c
diff --git a/lisp/nxml/char-name/unicode/002B0-002FF.el b/lisp/nxml/char-name/unicode/002B0-002FF.el
index 4f74699d76e..e94f58cc186 100644
--- a/lisp/nxml/char-name/unicode/002B0-002FF.el
+++ b/lisp/nxml/char-name/unicode/002B0-002FF.el
@@ -63,3 +63,5 @@
     ("MODIFIER LETTER UNASPIRATED" #x02ED)
     ("MODIFIER LETTER DOUBLE APOSTROPHE" #x02EE)
     ))
+
+;; arch-tag: 5fa09061-850e-4bbe-ad44-54c57a81a461
diff --git a/lisp/nxml/char-name/unicode/00300-0036F.el b/lisp/nxml/char-name/unicode/00300-0036F.el
index 33e9627d92e..d82fa0b2faf 100644
--- a/lisp/nxml/char-name/unicode/00300-0036F.el
+++ b/lisp/nxml/char-name/unicode/00300-0036F.el
@@ -96,3 +96,5 @@
     ("COMBINING LATIN SMALL LETTER V" #x036E)
     ("COMBINING LATIN SMALL LETTER X" #x036F)
     ))
+
+;; arch-tag: a3b46b6e-38fc-4043-b7f5-92a3591e2e47
diff --git a/lisp/nxml/char-name/unicode/00370-003FF.el b/lisp/nxml/char-name/unicode/00370-003FF.el
index 031b58d877d..780653b57b9 100644
--- a/lisp/nxml/char-name/unicode/00370-003FF.el
+++ b/lisp/nxml/char-name/unicode/00370-003FF.el
@@ -115,3 +115,5 @@
     ("GREEK LUNATE EPSILON SYMBOL" #x03F5)
     ("GREEK REVERSED LUNATE EPSILON SYMBOL" #x03F6)
     ))
+
+;; arch-tag: 033e25a2-6f9c-4e9f-b517-be5ed38829af
diff --git a/lisp/nxml/char-name/unicode/00400-004FF.el b/lisp/nxml/char-name/unicode/00400-004FF.el
index 9de27e0dc57..b041b437cc9 100644
--- a/lisp/nxml/char-name/unicode/00400-004FF.el
+++ b/lisp/nxml/char-name/unicode/00400-004FF.el
@@ -246,3 +246,5 @@
     ("CYRILLIC CAPITAL LETTER YERU WITH DIAERESIS" #x04F8)
     ("CYRILLIC SMALL LETTER YERU WITH DIAERESIS" #x04F9)
     ))
+
+;; arch-tag: 9cd8c4dd-3386-4c0a-b1dd-984efa12d958
diff --git a/lisp/nxml/char-name/unicode/00500-0052F.el b/lisp/nxml/char-name/unicode/00500-0052F.el
index a59541150ef..c098c898240 100644
--- a/lisp/nxml/char-name/unicode/00500-0052F.el
+++ b/lisp/nxml/char-name/unicode/00500-0052F.el
@@ -16,3 +16,5 @@
     ("CYRILLIC CAPITAL LETTER KOMI TJE" #x050E)
     ("CYRILLIC SMALL LETTER KOMI TJE" #x050F)
     ))
+
+;; arch-tag: 3ae51d36-3921-4ec5-b6be-3e9c895be9f3
diff --git a/lisp/nxml/char-name/unicode/00530-0058F.el b/lisp/nxml/char-name/unicode/00530-0058F.el
index 0f5d0ed1e5f..2b530a5afe4 100644
--- a/lisp/nxml/char-name/unicode/00530-0058F.el
+++ b/lisp/nxml/char-name/unicode/00530-0058F.el
@@ -86,3 +86,5 @@
     ("ARMENIAN FULL STOP" #x0589)
     ("ARMENIAN HYPHEN" #x058A)
     ))
+
+;; arch-tag: 7b3d705a-d060-42de-a918-ff39dbe5d276
diff --git a/lisp/nxml/char-name/unicode/00590-005FF.el b/lisp/nxml/char-name/unicode/00590-005FF.el
index b33d5ea0650..764022948ea 100644
--- a/lisp/nxml/char-name/unicode/00590-005FF.el
+++ b/lisp/nxml/char-name/unicode/00590-005FF.el
@@ -82,3 +82,5 @@
     ("HEBREW PUNCTUATION GERESH" #x05F3)
     ("HEBREW PUNCTUATION GERSHAYIM" #x05F4)
     ))
+
+;; arch-tag: 262da37d-1065-4dfd-b6e4-a8259a780caf
diff --git a/lisp/nxml/char-name/unicode/00600-006FF.el b/lisp/nxml/char-name/unicode/00600-006FF.el
index 9009737528a..c489a70dcac 100644
--- a/lisp/nxml/char-name/unicode/00600-006FF.el
+++ b/lisp/nxml/char-name/unicode/00600-006FF.el
@@ -208,3 +208,5 @@
     ("ARABIC SIGN SINDHI AMPERSAND" #x06FD)
     ("ARABIC SIGN SINDHI POSTPOSITION MEN" #x06FE)
     ))
+
+;; arch-tag: b20189fa-7cdb-4544-a41c-f4e0477d9e5e
diff --git a/lisp/nxml/char-name/unicode/00700-0074F.el b/lisp/nxml/char-name/unicode/00700-0074F.el
index 434861cf2b5..549387afe89 100644
--- a/lisp/nxml/char-name/unicode/00700-0074F.el
+++ b/lisp/nxml/char-name/unicode/00700-0074F.el
@@ -71,3 +71,5 @@
     ("SYRIAC MUSIC" #x0749)
     ("SYRIAC BARREKH" #x074A)
     ))
+
+;; arch-tag: c008122a-484e-4253-b18f-eb215dbd1ecf
diff --git a/lisp/nxml/char-name/unicode/00780-007BF.el b/lisp/nxml/char-name/unicode/00780-007BF.el
index bb572921ddc..cda860cfebd 100644
--- a/lisp/nxml/char-name/unicode/00780-007BF.el
+++ b/lisp/nxml/char-name/unicode/00780-007BF.el
@@ -50,3 +50,5 @@
     ("THAANA SUKUN" #x07B0)
     ("THAANA LETTER NAA" #x07B1)
     ))
+
+;; arch-tag: e1974c30-0604-412a-af3d-b6e688e0586c
diff --git a/lisp/nxml/char-name/unicode/00900-0097F.el b/lisp/nxml/char-name/unicode/00900-0097F.el
index c93dd4654b2..49bcde867d6 100644
--- a/lisp/nxml/char-name/unicode/00900-0097F.el
+++ b/lisp/nxml/char-name/unicode/00900-0097F.el
@@ -104,3 +104,5 @@
     ("DEVANAGARI DIGIT NINE" #x096F)
     ("DEVANAGARI ABBREVIATION SIGN" #x0970)
     ))
+
+;; arch-tag: c9d655c5-2ec9-4b64-a13f-d4fafe0cbad7
diff --git a/lisp/nxml/char-name/unicode/00980-009FF.el b/lisp/nxml/char-name/unicode/00980-009FF.el
index cfae10e0950..6c6b01e1a82 100644
--- a/lisp/nxml/char-name/unicode/00980-009FF.el
+++ b/lisp/nxml/char-name/unicode/00980-009FF.el
@@ -89,3 +89,5 @@
     ("BENGALI CURRENCY DENOMINATOR SIXTEEN" #x09F9)
     ("BENGALI ISSHAR" #x09FA)
     ))
+
+;; arch-tag: 66599f15-c2b7-436a-9737-577d4f041abd
diff --git a/lisp/nxml/char-name/unicode/00A00-00A7F.el b/lisp/nxml/char-name/unicode/00A00-00A7F.el
index 5adfaed0ef1..98f221a2014 100644
--- a/lisp/nxml/char-name/unicode/00A00-00A7F.el
+++ b/lisp/nxml/char-name/unicode/00A00-00A7F.el
@@ -75,3 +75,5 @@
     ("GURMUKHI URA" #x0A73)
     ("GURMUKHI EK ONKAR" #x0A74)
     ))
+
+;; arch-tag: e97fe67c-79ac-48f8-8274-22436eec2f01
diff --git a/lisp/nxml/char-name/unicode/00A80-00AFF.el b/lisp/nxml/char-name/unicode/00A80-00AFF.el
index 35be7fa7a55..3bbd427271a 100644
--- a/lisp/nxml/char-name/unicode/00A80-00AFF.el
+++ b/lisp/nxml/char-name/unicode/00A80-00AFF.el
@@ -78,3 +78,5 @@
     ("GUJARATI DIGIT EIGHT" #x0AEE)
     ("GUJARATI DIGIT NINE" #x0AEF)
     ))
+
+;; arch-tag: e11e63c9-1fd7-496b-be1b-4c2bb32bdec4
diff --git a/lisp/nxml/char-name/unicode/00B00-00B7F.el b/lisp/nxml/char-name/unicode/00B00-00B7F.el
index e0d08648c99..033d73b41dc 100644
--- a/lisp/nxml/char-name/unicode/00B00-00B7F.el
+++ b/lisp/nxml/char-name/unicode/00B00-00B7F.el
@@ -79,3 +79,5 @@
     ("ORIYA DIGIT NINE" #x0B6F)
     ("ORIYA ISSHAR" #x0B70)
     ))
+
+;; arch-tag: 3a780627-f875-450a-b482-6b25f28c6f96
diff --git a/lisp/nxml/char-name/unicode/00B80-00BFF.el b/lisp/nxml/char-name/unicode/00B80-00BFF.el
index 8e23e1341c7..ab5a34b821c 100644
--- a/lisp/nxml/char-name/unicode/00B80-00BFF.el
+++ b/lisp/nxml/char-name/unicode/00B80-00BFF.el
@@ -61,3 +61,5 @@
     ("TAMIL NUMBER ONE HUNDRED" #x0BF1)
     ("TAMIL NUMBER ONE THOUSAND" #x0BF2)
     ))
+
+;; arch-tag: a299bfdc-4543-4405-a4a8-202d178a578f
diff --git a/lisp/nxml/char-name/unicode/00C00-00C7F.el b/lisp/nxml/char-name/unicode/00C00-00C7F.el
index ef70b35ee10..8ccda98c60b 100644
--- a/lisp/nxml/char-name/unicode/00C00-00C7F.el
+++ b/lisp/nxml/char-name/unicode/00C00-00C7F.el
@@ -80,3 +80,5 @@
     ("TELUGU DIGIT EIGHT" #x0C6E)
     ("TELUGU DIGIT NINE" #x0C6F)
     ))
+
+;; arch-tag: 12e2c9a2-fa3a-400a-9adb-82a89e0a639b
diff --git a/lisp/nxml/char-name/unicode/00C80-00CFF.el b/lisp/nxml/char-name/unicode/00C80-00CFF.el
index b94e1944563..d5251fafbab 100644
--- a/lisp/nxml/char-name/unicode/00C80-00CFF.el
+++ b/lisp/nxml/char-name/unicode/00C80-00CFF.el
@@ -80,3 +80,5 @@
     ("KANNADA DIGIT EIGHT" #x0CEE)
     ("KANNADA DIGIT NINE" #x0CEF)
     ))
+
+;; arch-tag: b17f4e00-00e9-4e2f-8343-37b9c8e29e89
diff --git a/lisp/nxml/char-name/unicode/00D00-00D7F.el b/lisp/nxml/char-name/unicode/00D00-00D7F.el
index e9ea7e2aeaa..5d4a728ae05 100644
--- a/lisp/nxml/char-name/unicode/00D00-00D7F.el
+++ b/lisp/nxml/char-name/unicode/00D00-00D7F.el
@@ -78,3 +78,5 @@
     ("MALAYALAM DIGIT EIGHT" #x0D6E)
     ("MALAYALAM DIGIT NINE" #x0D6F)
     ))
+
+;; arch-tag: 1bce48f6-bdc3-4ebc-b1f0-1563c32e4926
diff --git a/lisp/nxml/char-name/unicode/00D80-00DFF.el b/lisp/nxml/char-name/unicode/00D80-00DFF.el
index d0278dd0884..3130b1f919d 100644
--- a/lisp/nxml/char-name/unicode/00D80-00DFF.el
+++ b/lisp/nxml/char-name/unicode/00D80-00DFF.el
@@ -80,3 +80,5 @@
     ("SINHALA VOWEL SIGN DIGA GAYANUKITTA" #x0DF3)
     ("SINHALA PUNCTUATION KUNDDALIYA" #x0DF4)
     ))
+
+;; arch-tag: 3dfac4e1-97f5-433a-bd47-8cd364b09075
diff --git a/lisp/nxml/char-name/unicode/00E00-00E7F.el b/lisp/nxml/char-name/unicode/00E00-00E7F.el
index ef5a9bb949c..f265a069a5c 100644
--- a/lisp/nxml/char-name/unicode/00E00-00E7F.el
+++ b/lisp/nxml/char-name/unicode/00E00-00E7F.el
@@ -87,3 +87,5 @@
     ("THAI CHARACTER ANGKHANKHU" #x0E5A)
     ("THAI CHARACTER KHOMUT" #x0E5B)
     ))
+
+;; arch-tag: cf6119b0-ae54-4871-a8a7-10621d74cba8
diff --git a/lisp/nxml/char-name/unicode/00E80-00EFF.el b/lisp/nxml/char-name/unicode/00E80-00EFF.el
index f9842bc8cbc..29be3e172a7 100644
--- a/lisp/nxml/char-name/unicode/00E80-00EFF.el
+++ b/lisp/nxml/char-name/unicode/00E80-00EFF.el
@@ -65,3 +65,5 @@
     ("LAO HO NO" #x0EDC)
     ("LAO HO MO" #x0EDD)
     ))
+
+;; arch-tag: 36f98cb4-447d-49e0-bae5-03a026adabac
diff --git a/lisp/nxml/char-name/unicode/00F00-00FFF.el b/lisp/nxml/char-name/unicode/00F00-00FFF.el
index 7440269e0e3..8e8be125ccc 100644
--- a/lisp/nxml/char-name/unicode/00F00-00FFF.el
+++ b/lisp/nxml/char-name/unicode/00F00-00FFF.el
@@ -193,3 +193,5 @@
     ("TIBETAN SYMBOL NOR BU BZHI -KHYIL" #x0FCC)
     ("TIBETAN SIGN RDEL NAG GSUM" #x0FCF)
     ))
+
+;; arch-tag: 547e48c6-3ded-4dc7-be69-4ee324c604c3
diff --git a/lisp/nxml/char-name/unicode/01000-0109F.el b/lisp/nxml/char-name/unicode/01000-0109F.el
index 4465de42dda..56ab64648b5 100644
--- a/lisp/nxml/char-name/unicode/01000-0109F.el
+++ b/lisp/nxml/char-name/unicode/01000-0109F.el
@@ -78,3 +78,5 @@
     ("MYANMAR VOWEL SIGN VOCALIC L" #x1058)
     ("MYANMAR VOWEL SIGN VOCALIC LL" #x1059)
     ))
+
+;; arch-tag: 030cc7f0-2667-4504-ae9c-39c00fe146ff
diff --git a/lisp/nxml/char-name/unicode/010A0-010FF.el b/lisp/nxml/char-name/unicode/010A0-010FF.el
index 26abf69d527..d8c3ab7d314 100644
--- a/lisp/nxml/char-name/unicode/010A0-010FF.el
+++ b/lisp/nxml/char-name/unicode/010A0-010FF.el
@@ -80,3 +80,5 @@
     ("GEORGIAN LETTER ELIFI" #x10F8)
     ("GEORGIAN PARAGRAPH SEPARATOR" #x10FB)
     ))
+
+;; arch-tag: 8f5a9cec-8b71-48c9-af68-c8c51112e5b2
diff --git a/lisp/nxml/char-name/unicode/01100-011FF.el b/lisp/nxml/char-name/unicode/01100-011FF.el
index b89d01536f8..7e7619d3e8f 100644
--- a/lisp/nxml/char-name/unicode/01100-011FF.el
+++ b/lisp/nxml/char-name/unicode/01100-011FF.el
@@ -240,3 +240,5 @@
     ("HANGUL JONGSEONG HIEUH-PIEUP" #x11F8)
     ("HANGUL JONGSEONG YEORINHIEUH" #x11F9)
     ))
+
+;; arch-tag: e631a2ad-7d7e-4a86-89f0-e6e4f7db5f39
diff --git a/lisp/nxml/char-name/unicode/01200-0137F.el b/lisp/nxml/char-name/unicode/01200-0137F.el
index 06f59a3d841..26a5a3a3836 100644
--- a/lisp/nxml/char-name/unicode/01200-0137F.el
+++ b/lisp/nxml/char-name/unicode/01200-0137F.el
@@ -345,3 +345,5 @@
     ("ETHIOPIC NUMBER HUNDRED" #x137B)
     ("ETHIOPIC NUMBER TEN THOUSAND" #x137C)
     ))
+
+;; arch-tag: a34092f4-c605-4c01-b619-222a1241853d
diff --git a/lisp/nxml/char-name/unicode/013A0-013FF.el b/lisp/nxml/char-name/unicode/013A0-013FF.el
index 74111fb8b09..e3fd669671f 100644
--- a/lisp/nxml/char-name/unicode/013A0-013FF.el
+++ b/lisp/nxml/char-name/unicode/013A0-013FF.el
@@ -85,3 +85,5 @@
     ("CHEROKEE LETTER YU" #x13F3)
     ("CHEROKEE LETTER YV" #x13F4)
     ))
+
+;; arch-tag: 42d669f3-aa0a-4b38-8f60-c1bf05b0d8be
diff --git a/lisp/nxml/char-name/unicode/01400-0167F.el b/lisp/nxml/char-name/unicode/01400-0167F.el
index 644b2552d00..1dfce26a852 100644
--- a/lisp/nxml/char-name/unicode/01400-0167F.el
+++ b/lisp/nxml/char-name/unicode/01400-0167F.el
@@ -630,3 +630,5 @@
     ("CANADIAN SYLLABICS NNGA" #x1675)
     ("CANADIAN SYLLABICS NNGAA" #x1676)
     ))
+
+;; arch-tag: 7b4079a4-dea1-44b9-9699-8826b5919ad7
diff --git a/lisp/nxml/char-name/unicode/01680-0169F.el b/lisp/nxml/char-name/unicode/01680-0169F.el
index 827b70e6b00..52c4cce8798 100644
--- a/lisp/nxml/char-name/unicode/01680-0169F.el
+++ b/lisp/nxml/char-name/unicode/01680-0169F.el
@@ -29,3 +29,5 @@
     ("OGHAM FEATHER MARK" #x169B)
     ("OGHAM REVERSED FEATHER MARK" #x169C)
     ))
+
+;; arch-tag: db8ea8fc-61b4-4f83-97f5-d2a952b9d8b6
diff --git a/lisp/nxml/char-name/unicode/016A0-016FF.el b/lisp/nxml/char-name/unicode/016A0-016FF.el
index ce67a4069e5..81f1df77c27 100644
--- a/lisp/nxml/char-name/unicode/016A0-016FF.el
+++ b/lisp/nxml/char-name/unicode/016A0-016FF.el
@@ -81,3 +81,5 @@
     ("RUNIC TVIMADUR SYMBOL" #x16EF)
     ("RUNIC BELGTHOR SYMBOL" #x16F0)
     ))
+
+;; arch-tag: e21b5eb5-adb4-44fa-a453-995bf3c7fdc5
diff --git a/lisp/nxml/char-name/unicode/01700-0171F.el b/lisp/nxml/char-name/unicode/01700-0171F.el
index b30500639b6..06df5066a6a 100644
--- a/lisp/nxml/char-name/unicode/01700-0171F.el
+++ b/lisp/nxml/char-name/unicode/01700-0171F.el
@@ -20,3 +20,5 @@
     ("TAGALOG VOWEL SIGN U" #x1713)
     ("TAGALOG SIGN VIRAMA" #x1714)
     ))
+
+;; arch-tag: f30d4825-3942-4534-8671-5fcd71df44ba
diff --git a/lisp/nxml/char-name/unicode/01720-0173F.el b/lisp/nxml/char-name/unicode/01720-0173F.el
index 09f61ea1b55..a7530051cea 100644
--- a/lisp/nxml/char-name/unicode/01720-0173F.el
+++ b/lisp/nxml/char-name/unicode/01720-0173F.el
@@ -23,3 +23,5 @@
     ("PHILIPPINE SINGLE PUNCTUATION" #x1735)
     ("PHILIPPINE DOUBLE PUNCTUATION" #x1736)
     ))
+
+;; arch-tag: d577c8e1-70e3-4afc-82f4-b61e4cf0b603
diff --git a/lisp/nxml/char-name/unicode/01740-0175F.el b/lisp/nxml/char-name/unicode/01740-0175F.el
index b507c90c268..4043bcc317c 100644
--- a/lisp/nxml/char-name/unicode/01740-0175F.el
+++ b/lisp/nxml/char-name/unicode/01740-0175F.el
@@ -20,3 +20,5 @@
     ("BUHID VOWEL SIGN I" #x1752)
     ("BUHID VOWEL SIGN U" #x1753)
     ))
+
+;; arch-tag: a30b6352-4c93-4908-a5df-0172b643ae23
diff --git a/lisp/nxml/char-name/unicode/01760-0177F.el b/lisp/nxml/char-name/unicode/01760-0177F.el
index e824c2bd434..d6bb109d8db 100644
--- a/lisp/nxml/char-name/unicode/01760-0177F.el
+++ b/lisp/nxml/char-name/unicode/01760-0177F.el
@@ -18,3 +18,5 @@
     ("TAGBANWA VOWEL SIGN I" #x1772)
     ("TAGBANWA VOWEL SIGN U" #x1773)
     ))
+
+;; arch-tag: 7ec84a4f-8077-400f-9b1a-f31b6d75fb65
diff --git a/lisp/nxml/char-name/unicode/01780-017FF.el b/lisp/nxml/char-name/unicode/01780-017FF.el
index e9671c943ca..182440e5eb1 100644
--- a/lisp/nxml/char-name/unicode/01780-017FF.el
+++ b/lisp/nxml/char-name/unicode/01780-017FF.el
@@ -103,3 +103,5 @@
     ("KHMER DIGIT EIGHT" #x17E8)
     ("KHMER DIGIT NINE" #x17E9)
     ))
+
+;; arch-tag: 2d03b253-c5f2-4595-b346-36e3b87df51c
diff --git a/lisp/nxml/char-name/unicode/01800-018AF.el b/lisp/nxml/char-name/unicode/01800-018AF.el
index fd3e2455a29..a24ec715bc4 100644
--- a/lisp/nxml/char-name/unicode/01800-018AF.el
+++ b/lisp/nxml/char-name/unicode/01800-018AF.el
@@ -155,3 +155,5 @@
     ("MONGOLIAN LETTER MANCHU ALI GALI BHA" #x18A8)
     ("MONGOLIAN LETTER ALI GALI DAGALGA" #x18A9)
     ))
+
+;; arch-tag: 36134d5c-514f-4042-b104-97688d5194b4
diff --git a/lisp/nxml/char-name/unicode/01E00-01EFF.el b/lisp/nxml/char-name/unicode/01E00-01EFF.el
index 618b74cd3da..fed5cf3ca7b 100644
--- a/lisp/nxml/char-name/unicode/01E00-01EFF.el
+++ b/lisp/nxml/char-name/unicode/01E00-01EFF.el
@@ -246,3 +246,5 @@
     ("LATIN CAPITAL LETTER Y WITH TILDE" #x1EF8)
     ("LATIN SMALL LETTER Y WITH TILDE" #x1EF9)
     ))
+
+;; arch-tag: 67862606-3d2a-4063-b666-45ccd6edff6b
diff --git a/lisp/nxml/char-name/unicode/01F00-01FFF.el b/lisp/nxml/char-name/unicode/01F00-01FFF.el
index 56ce30a017a..5da301f019b 100644
--- a/lisp/nxml/char-name/unicode/01F00-01FFF.el
+++ b/lisp/nxml/char-name/unicode/01F00-01FFF.el
@@ -233,3 +233,5 @@
     ("GREEK OXIA" #x1FFD)
     ("GREEK DASIA" #x1FFE)
     ))
+
+;; arch-tag: ace2193e-e5be-4800-898e-efad7ba5d6da
diff --git a/lisp/nxml/char-name/unicode/02000-0206F.el b/lisp/nxml/char-name/unicode/02000-0206F.el
index 54f6207cd42..0a367cb1e1e 100644
--- a/lisp/nxml/char-name/unicode/02000-0206F.el
+++ b/lisp/nxml/char-name/unicode/02000-0206F.el
@@ -95,3 +95,5 @@
     ("NATIONAL DIGIT SHAPES" #x206E)
     ("NOMINAL DIGIT SHAPES" #x206F)
     ))
+
+;; arch-tag: 9208787e-c528-416d-a9b1-7261c9cde84e
diff --git a/lisp/nxml/char-name/unicode/02070-0209F.el b/lisp/nxml/char-name/unicode/02070-0209F.el
index 5d37880fd62..aad7f331ccc 100644
--- a/lisp/nxml/char-name/unicode/02070-0209F.el
+++ b/lisp/nxml/char-name/unicode/02070-0209F.el
@@ -29,3 +29,5 @@
     ("SUBSCRIPT LEFT PARENTHESIS" #x208D)
     ("SUBSCRIPT RIGHT PARENTHESIS" #x208E)
     ))
+
+;; arch-tag: 59e357e5-c021-440d-a923-921b485dcbb8
diff --git a/lisp/nxml/char-name/unicode/020A0-020CF.el b/lisp/nxml/char-name/unicode/020A0-020CF.el
index 1cab37edcbc..98f334752b8 100644
--- a/lisp/nxml/char-name/unicode/020A0-020CF.el
+++ b/lisp/nxml/char-name/unicode/020A0-020CF.el
@@ -18,3 +18,5 @@
     ("GERMAN PENNY SIGN" #x20B0)
     ("PESO SIGN" #x20B1)
     ))
+
+;; arch-tag: 2f9ece37-0ae6-4a82-b12e-dc10ac58e6ce
diff --git a/lisp/nxml/char-name/unicode/020D0-020FF.el b/lisp/nxml/char-name/unicode/020D0-020FF.el
index e610d399d49..c2626c6f362 100644
--- a/lisp/nxml/char-name/unicode/020D0-020FF.el
+++ b/lisp/nxml/char-name/unicode/020D0-020FF.el
@@ -27,3 +27,5 @@
     ("COMBINING WIDE BRIDGE ABOVE" #x20E9)
     ("COMBINING LEFTWARDS ARROW OVERLAY" #x20EA)
     ))
+
+;; arch-tag: 4b1f7ef0-287b-49a6-a9f2-910752aac517
diff --git a/lisp/nxml/char-name/unicode/02100-0214F.el b/lisp/nxml/char-name/unicode/02100-0214F.el
index bdf929f6544..1c499c0c020 100644
--- a/lisp/nxml/char-name/unicode/02100-0214F.el
+++ b/lisp/nxml/char-name/unicode/02100-0214F.el
@@ -74,3 +74,5 @@
     ("PROPERTY LINE" #x214A)
     ("TURNED AMPERSAND" #x214B)
     ))
+
+;; arch-tag: 4233f761-f78d-4854-a019-2409f78514fa
diff --git a/lisp/nxml/char-name/unicode/02150-0218F.el b/lisp/nxml/char-name/unicode/02150-0218F.el
index 4300c497803..ac2e7067fd1 100644
--- a/lisp/nxml/char-name/unicode/02150-0218F.el
+++ b/lisp/nxml/char-name/unicode/02150-0218F.el
@@ -49,3 +49,5 @@
     ("ROMAN NUMERAL TEN THOUSAND" #x2182)
     ("ROMAN NUMERAL REVERSED ONE HUNDRED" #x2183)
     ))
+
+;; arch-tag: 9931b436-670d-471f-8214-f4c4454ae841
diff --git a/lisp/nxml/char-name/unicode/02190-021FF.el b/lisp/nxml/char-name/unicode/02190-021FF.el
index 88989ed7b63..4a2851a9552 100644
--- a/lisp/nxml/char-name/unicode/02190-021FF.el
+++ b/lisp/nxml/char-name/unicode/02190-021FF.el
@@ -112,3 +112,5 @@
     ("RIGHTWARDS OPEN-HEADED ARROW" #x21FE)
     ("LEFT RIGHT OPEN-HEADED ARROW" #x21FF)
     ))
+
+;; arch-tag: de5679de-82b6-4d64-9b7c-79c35e12521d
diff --git a/lisp/nxml/char-name/unicode/02200-022FF.el b/lisp/nxml/char-name/unicode/02200-022FF.el
index a28f77853db..be8278341d0 100644
--- a/lisp/nxml/char-name/unicode/02200-022FF.el
+++ b/lisp/nxml/char-name/unicode/02200-022FF.el
@@ -256,3 +256,5 @@
     ("SMALL CONTAINS WITH OVERBAR" #x22FE)
     ("Z NOTATION BAG MEMBERSHIP" #x22FF)
     ))
+
+;; arch-tag: 12911bcf-5cc6-4b8a-9f0e-48c0b6f85566
diff --git a/lisp/nxml/char-name/unicode/02300-023FF.el b/lisp/nxml/char-name/unicode/02300-023FF.el
index a2558948319..58526bd98ec 100644
--- a/lisp/nxml/char-name/unicode/02300-023FF.el
+++ b/lisp/nxml/char-name/unicode/02300-023FF.el
@@ -207,3 +207,5 @@
     ("SQUARE FOOT" #x23CD)
     ("RETURN SYMBOL" #x23CE)
     ))
+
+;; arch-tag: ee70bee5-f22f-4c0e-bed6-2606b27d94cf
diff --git a/lisp/nxml/char-name/unicode/02400-0243F.el b/lisp/nxml/char-name/unicode/02400-0243F.el
index b4cc42640f4..ff6bdce8483 100644
--- a/lisp/nxml/char-name/unicode/02400-0243F.el
+++ b/lisp/nxml/char-name/unicode/02400-0243F.el
@@ -39,3 +39,5 @@
     ("SYMBOL FOR DELETE FORM TWO" #x2425)
     ("SYMBOL FOR SUBSTITUTE FORM TWO" #x2426)
     ))
+
+;; arch-tag: efc349c9-065d-4033-b261-7cb961c54072
diff --git a/lisp/nxml/char-name/unicode/02440-0245F.el b/lisp/nxml/char-name/unicode/02440-0245F.el
index 332720d71f0..3a484cec296 100644
--- a/lisp/nxml/char-name/unicode/02440-0245F.el
+++ b/lisp/nxml/char-name/unicode/02440-0245F.el
@@ -11,3 +11,5 @@
     ("OCR CUSTOMER ACCOUNT NUMBER" #x2449)
     ("OCR DOUBLE BACKSLASH" #x244A)
     ))
+
+;; arch-tag: e532db31-38fd-4eee-8e47-974316fb6dd5
diff --git a/lisp/nxml/char-name/unicode/02460-024FF.el b/lisp/nxml/char-name/unicode/02460-024FF.el
index 41152bff4a6..4cbea4a5f6f 100644
--- a/lisp/nxml/char-name/unicode/02460-024FF.el
+++ b/lisp/nxml/char-name/unicode/02460-024FF.el
@@ -159,3 +159,5 @@
     ("DOUBLE CIRCLED DIGIT NINE" #x24FD)
     ("DOUBLE CIRCLED NUMBER TEN" #x24FE)
     ))
+
+;; arch-tag: 2ec7ede5-ce9d-48b5-a725-dd3f177060f4
diff --git a/lisp/nxml/char-name/unicode/02500-0257F.el b/lisp/nxml/char-name/unicode/02500-0257F.el
index bf17039df2b..97e63df862c 100644
--- a/lisp/nxml/char-name/unicode/02500-0257F.el
+++ b/lisp/nxml/char-name/unicode/02500-0257F.el
@@ -128,3 +128,5 @@
     ("BOX DRAWINGS HEAVY LEFT AND LIGHT RIGHT" #x257E)
     ("BOX DRAWINGS HEAVY UP AND LIGHT DOWN" #x257F)
     ))
+
+;; arch-tag: 6870ad7c-84cf-42a0-82ce-f6863da1c7ad
diff --git a/lisp/nxml/char-name/unicode/02580-0259F.el b/lisp/nxml/char-name/unicode/02580-0259F.el
index 89413a2e441..bc4d6a12bff 100644
--- a/lisp/nxml/char-name/unicode/02580-0259F.el
+++ b/lisp/nxml/char-name/unicode/02580-0259F.el
@@ -32,3 +32,5 @@
     ("QUADRANT UPPER RIGHT AND LOWER LEFT" #x259E)
     ("QUADRANT UPPER RIGHT AND LOWER LEFT AND LOWER RIGHT" #x259F)
     ))
+
+;; arch-tag: 51c971a7-cd90-42a5-bf18-dd9683bcab41
diff --git a/lisp/nxml/char-name/unicode/025A0-025FF.el b/lisp/nxml/char-name/unicode/025A0-025FF.el
index 2313c781d66..47284d4a126 100644
--- a/lisp/nxml/char-name/unicode/025A0-025FF.el
+++ b/lisp/nxml/char-name/unicode/025A0-025FF.el
@@ -96,3 +96,5 @@
     ("BLACK MEDIUM SMALL SQUARE" #x25FE)
     ("LOWER RIGHT TRIANGLE" #x25FF)
     ))
+
+;; arch-tag: ac97acd5-57a6-4521-bee4-8c2d0a9bd06a
diff --git a/lisp/nxml/char-name/unicode/02600-026FF.el b/lisp/nxml/char-name/unicode/02600-026FF.el
index eaae9bec08f..c0d0a065aef 100644
--- a/lisp/nxml/char-name/unicode/02600-026FF.el
+++ b/lisp/nxml/char-name/unicode/02600-026FF.el
@@ -133,3 +133,5 @@
     ("BLACK CIRCLE WITH WHITE DOT RIGHT" #x2688)
     ("BLACK CIRCLE WITH TWO WHITE DOTS" #x2689)
     ))
+
+;; arch-tag: b976b52e-eefc-4aa3-b96c-7f4998429f77
diff --git a/lisp/nxml/char-name/unicode/02700-027BF.el b/lisp/nxml/char-name/unicode/02700-027BF.el
index e4361a32404..47599255870 100644
--- a/lisp/nxml/char-name/unicode/02700-027BF.el
+++ b/lisp/nxml/char-name/unicode/02700-027BF.el
@@ -174,3 +174,5 @@
     ("HEAVY WEDGE-TAILED RIGHTWARDS ARROW" #x27BD)
     ("OPEN-OUTLINED RIGHTWARDS ARROW" #x27BE)
     ))
+
+;; arch-tag: 183adc05-e931-4f1b-8a89-abd760a8fcd5
diff --git a/lisp/nxml/char-name/unicode/027C0-027EF.el b/lisp/nxml/char-name/unicode/027C0-027EF.el
index c68207cff76..e0171576a54 100644
--- a/lisp/nxml/char-name/unicode/027C0-027EF.el
+++ b/lisp/nxml/char-name/unicode/027C0-027EF.el
@@ -28,3 +28,5 @@
     ("MATHEMATICAL LEFT DOUBLE ANGLE BRACKET" #x27EA)
     ("MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET" #x27EB)
     ))
+
+;; arch-tag: f66b9857-6560-4ad9-9adb-1f3b5fb079de
diff --git a/lisp/nxml/char-name/unicode/027F0-027FF.el b/lisp/nxml/char-name/unicode/027F0-027FF.el
index 3403ce46146..5da2bc2a226 100644
--- a/lisp/nxml/char-name/unicode/027F0-027FF.el
+++ b/lisp/nxml/char-name/unicode/027F0-027FF.el
@@ -16,3 +16,5 @@
     ("LONG RIGHTWARDS DOUBLE ARROW FROM BAR" #x27FE)
     ("LONG RIGHTWARDS SQUIGGLE ARROW" #x27FF)
     ))
+
+;; arch-tag: 64623112-13d2-4bd6-8768-5508e3a7f8a9
diff --git a/lisp/nxml/char-name/unicode/02800-028FF.el b/lisp/nxml/char-name/unicode/02800-028FF.el
index 91876d840bf..d936481acac 100644
--- a/lisp/nxml/char-name/unicode/02800-028FF.el
+++ b/lisp/nxml/char-name/unicode/02800-028FF.el
@@ -256,3 +256,5 @@
     ("BRAILLE PATTERN DOTS-2345678" #x28FE)
     ("BRAILLE PATTERN DOTS-12345678" #x28FF)
     ))
+
+;; arch-tag: 461f6d3c-a4fb-404c-a107-ec8afd212bd2
diff --git a/lisp/nxml/char-name/unicode/02900-0297F.el b/lisp/nxml/char-name/unicode/02900-0297F.el
index a70eb7fe839..d1c217b0df4 100644
--- a/lisp/nxml/char-name/unicode/02900-0297F.el
+++ b/lisp/nxml/char-name/unicode/02900-0297F.el
@@ -128,3 +128,5 @@
     ("UP FISH TAIL" #x297E)
     ("DOWN FISH TAIL" #x297F)
     ))
+
+;; arch-tag: 57fdeec3-1003-4f3e-ac93-1d698f6eacd8
diff --git a/lisp/nxml/char-name/unicode/02980-029FF.el b/lisp/nxml/char-name/unicode/02980-029FF.el
index f1e368783a6..11197e31c91 100644
--- a/lisp/nxml/char-name/unicode/02980-029FF.el
+++ b/lisp/nxml/char-name/unicode/02980-029FF.el
@@ -128,3 +128,5 @@
     ("TINY" #x29FE)
     ("MINY" #x29FF)
     ))
+
+;; arch-tag: 4ae3dcff-8f56-4f7e-b9f3-07108e543969
diff --git a/lisp/nxml/char-name/unicode/02A00-02AFF.el b/lisp/nxml/char-name/unicode/02A00-02AFF.el
index e6f9ca432bb..3cdaa5d295c 100644
--- a/lisp/nxml/char-name/unicode/02A00-02AFF.el
+++ b/lisp/nxml/char-name/unicode/02A00-02AFF.el
@@ -256,3 +256,5 @@
     ("WHITE VERTICAL BAR" #x2AFE)
     ("N-ARY WHITE VERTICAL BAR" #x2AFF)
     ))
+
+;; arch-tag: 672a8fbf-fb4a-4862-8b8e-2379b799484c
diff --git a/lisp/nxml/char-name/unicode/02E80-02EFF.el b/lisp/nxml/char-name/unicode/02E80-02EFF.el
index 3cb901803bc..deb81105eab 100644
--- a/lisp/nxml/char-name/unicode/02E80-02EFF.el
+++ b/lisp/nxml/char-name/unicode/02E80-02EFF.el
@@ -115,3 +115,5 @@
     ("CJK RADICAL J-SIMPLIFIED TURTLE" #x2EF2)
     ("CJK RADICAL C-SIMPLIFIED TURTLE" #x2EF3)
     ))
+
+;; arch-tag: 59a2c3dd-63ee-4cba-b427-1e8eb782634f
diff --git a/lisp/nxml/char-name/unicode/02F00-02FDF.el b/lisp/nxml/char-name/unicode/02F00-02FDF.el
index 89c202709f6..1a2448aa844 100644
--- a/lisp/nxml/char-name/unicode/02F00-02FDF.el
+++ b/lisp/nxml/char-name/unicode/02F00-02FDF.el
@@ -214,3 +214,5 @@
     ("KANGXI RADICAL TURTLE" #x2FD4)
     ("KANGXI RADICAL FLUTE" #x2FD5)
     ))
+
+;; arch-tag: e7210935-b74b-4a42-88c6-de146c755742
diff --git a/lisp/nxml/char-name/unicode/02FF0-02FFF.el b/lisp/nxml/char-name/unicode/02FF0-02FFF.el
index 9232af9cab1..f94bd1fe313 100644
--- a/lisp/nxml/char-name/unicode/02FF0-02FFF.el
+++ b/lisp/nxml/char-name/unicode/02FF0-02FFF.el
@@ -12,3 +12,5 @@
     ("IDEOGRAPHIC DESCRIPTION CHARACTER SURROUND FROM LOWER LEFT" #x2FFA)
     ("IDEOGRAPHIC DESCRIPTION CHARACTER OVERLAID" #x2FFB)
     ))
+
+;; arch-tag: dd6d1436-4620-4994-8da5-9140a8a6ec5b
diff --git a/lisp/nxml/char-name/unicode/03000-0303F.el b/lisp/nxml/char-name/unicode/03000-0303F.el
index 0b481adb4c4..997795f31dd 100644
--- a/lisp/nxml/char-name/unicode/03000-0303F.el
+++ b/lisp/nxml/char-name/unicode/03000-0303F.el
@@ -64,3 +64,5 @@
     ("IDEOGRAPHIC VARIATION INDICATOR" #x303E)
     ("IDEOGRAPHIC HALF FILL SPACE" #x303F)
     ))
+
+;; arch-tag: 05689acc-1d48-4a36-9b60-75d5abf8a065
diff --git a/lisp/nxml/char-name/unicode/03040-0309F.el b/lisp/nxml/char-name/unicode/03040-0309F.el
index c19e541e0a4..18cdaa0827b 100644
--- a/lisp/nxml/char-name/unicode/03040-0309F.el
+++ b/lisp/nxml/char-name/unicode/03040-0309F.el
@@ -93,3 +93,5 @@
     ("HIRAGANA VOICED ITERATION MARK" #x309E)
     ("HIRAGANA DIGRAPH YORI" #x309F)
     ))
+
+;; arch-tag: dc96b2bf-74f6-4885-adbb-4a81bd2884be
diff --git a/lisp/nxml/char-name/unicode/030A0-030FF.el b/lisp/nxml/char-name/unicode/030A0-030FF.el
index 52168c73ad0..24070605273 100644
--- a/lisp/nxml/char-name/unicode/030A0-030FF.el
+++ b/lisp/nxml/char-name/unicode/030A0-030FF.el
@@ -96,3 +96,5 @@
     ("KATAKANA VOICED ITERATION MARK" #x30FE)
     ("KATAKANA DIGRAPH KOTO" #x30FF)
     ))
+
+;; arch-tag: 58c48b02-037a-43f3-b225-9e9bf37a7fbd
diff --git a/lisp/nxml/char-name/unicode/03100-0312F.el b/lisp/nxml/char-name/unicode/03100-0312F.el
index ea0cc9ee5e1..f7fa151bb67 100644
--- a/lisp/nxml/char-name/unicode/03100-0312F.el
+++ b/lisp/nxml/char-name/unicode/03100-0312F.el
@@ -40,3 +40,5 @@
     ("BOPOMOFO LETTER NG" #x312B)
     ("BOPOMOFO LETTER GN" #x312C)
     ))
+
+;; arch-tag: 0aeb6bb4-ac93-4014-a836-eb793636a168
diff --git a/lisp/nxml/char-name/unicode/03130-0318F.el b/lisp/nxml/char-name/unicode/03130-0318F.el
index 5e7746f4a50..8bf3334371a 100644
--- a/lisp/nxml/char-name/unicode/03130-0318F.el
+++ b/lisp/nxml/char-name/unicode/03130-0318F.el
@@ -94,3 +94,5 @@
     ("HANGUL LETTER ARAEA" #x318D)
     ("HANGUL LETTER ARAEAE" #x318E)
     ))
+
+;; arch-tag: 3ea3aa1e-8551-433b-8506-9591ed150673
diff --git a/lisp/nxml/char-name/unicode/03190-0319F.el b/lisp/nxml/char-name/unicode/03190-0319F.el
index b8520da93a0..1fe8f164c63 100644
--- a/lisp/nxml/char-name/unicode/03190-0319F.el
+++ b/lisp/nxml/char-name/unicode/03190-0319F.el
@@ -16,3 +16,5 @@
     ("IDEOGRAPHIC ANNOTATION EARTH MARK" #x319E)
     ("IDEOGRAPHIC ANNOTATION MAN MARK" #x319F)
     ))
+
+;; arch-tag: e25f7331-0993-4daf-a193-0fe56332f9fa
diff --git a/lisp/nxml/char-name/unicode/031A0-031BF.el b/lisp/nxml/char-name/unicode/031A0-031BF.el
index 18392547c89..0119b7e78d2 100644
--- a/lisp/nxml/char-name/unicode/031A0-031BF.el
+++ b/lisp/nxml/char-name/unicode/031A0-031BF.el
@@ -24,3 +24,5 @@
     ("BOPOMOFO FINAL LETTER K" #x31B6)
     ("BOPOMOFO FINAL LETTER H" #x31B7)
     ))
+
+;; arch-tag: 1821baca-d463-4e8e-bf3d-97a35af58fd4
diff --git a/lisp/nxml/char-name/unicode/031F0-031FF.el b/lisp/nxml/char-name/unicode/031F0-031FF.el
index e637bf3c6d7..125d12d30f7 100644
--- a/lisp/nxml/char-name/unicode/031F0-031FF.el
+++ b/lisp/nxml/char-name/unicode/031F0-031FF.el
@@ -16,3 +16,5 @@
     ("KATAKANA LETTER SMALL RE" #x31FE)
     ("KATAKANA LETTER SMALL RO" #x31FF)
     ))
+
+;; arch-tag: 090acfb7-1a46-4b05-bebb-573bbc0d8a82
diff --git a/lisp/nxml/char-name/unicode/03200-032FF.el b/lisp/nxml/char-name/unicode/03200-032FF.el
index 625ff5bdfdb..8b8c84e07d4 100644
--- a/lisp/nxml/char-name/unicode/03200-032FF.el
+++ b/lisp/nxml/char-name/unicode/03200-032FF.el
@@ -232,3 +232,5 @@
     ("CIRCLED KATAKANA WE" #x32FD)
     ("CIRCLED KATAKANA WO" #x32FE)
     ))
+
+;; arch-tag: 56d35bfa-c41b-4779-be54-3999fbe11265
diff --git a/lisp/nxml/char-name/unicode/03300-033FF.el b/lisp/nxml/char-name/unicode/03300-033FF.el
index 25a070fd6cf..acf2b6899b5 100644
--- a/lisp/nxml/char-name/unicode/03300-033FF.el
+++ b/lisp/nxml/char-name/unicode/03300-033FF.el
@@ -249,3 +249,5 @@
     ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY" #x33FD)
     ("IDEOGRAPHIC TELEGRAPH SYMBOL FOR DAY THIRTY-ONE" #x33FE)
     ))
+
+;; arch-tag: 818090a1-7854-485f-80bc-97e89f733e75
diff --git a/lisp/nxml/char-name/unicode/03400-04DBF.el b/lisp/nxml/char-name/unicode/03400-04DBF.el
index 14d5c4bff57..45d69119e80 100644
--- a/lisp/nxml/char-name/unicode/03400-04DBF.el
+++ b/lisp/nxml/char-name/unicode/03400-04DBF.el
@@ -1,2 +1,4 @@
 (nxml-define-char-name-set 'cjk-unified-ideographs-extension-a
   '())
+
+;; arch-tag: 571a41a5-7cc5-47c4-b98c-e98a415723bb
diff --git a/lisp/nxml/char-name/unicode/0A000-0A48F.el b/lisp/nxml/char-name/unicode/0A000-0A48F.el
index 8d0727f6c1d..9c54d94e55d 100644
--- a/lisp/nxml/char-name/unicode/0A000-0A48F.el
+++ b/lisp/nxml/char-name/unicode/0A000-0A48F.el
@@ -1165,3 +1165,5 @@
     ("YI SYLLABLE YYRX" #xA48B)
     ("YI SYLLABLE YYR" #xA48C)
     ))
+
+;; arch-tag: 4c900a8b-cd84-4c41-86f4-dcb47efac01b
diff --git a/lisp/nxml/char-name/unicode/0A490-0A4CF.el b/lisp/nxml/char-name/unicode/0A490-0A4CF.el
index 16c8656b48d..57e731ed129 100644
--- a/lisp/nxml/char-name/unicode/0A490-0A4CF.el
+++ b/lisp/nxml/char-name/unicode/0A490-0A4CF.el
@@ -55,3 +55,5 @@
     ("YI RADICAL NBIE" #xA4C5)
     ("YI RADICAL KE" #xA4C6)
     ))
+
+;; arch-tag: 2c93cdf1-e6f2-4a91-a798-3e1d7c094cf4
diff --git a/lisp/nxml/char-name/unicode/0FB00-0FB4F.el b/lisp/nxml/char-name/unicode/0FB00-0FB4F.el
index 36818c1e130..52d47dd746a 100644
--- a/lisp/nxml/char-name/unicode/0FB00-0FB4F.el
+++ b/lisp/nxml/char-name/unicode/0FB00-0FB4F.el
@@ -58,3 +58,5 @@
     ("HEBREW LETTER PE WITH RAFE" #xFB4E)
     ("HEBREW LIGATURE ALEF LAMED" #xFB4F)
     ))
+
+;; arch-tag: 06519b44-408f-43f4-89e6-3e5c1d2afe4d
diff --git a/lisp/nxml/char-name/unicode/0FB50-0FDFF.el b/lisp/nxml/char-name/unicode/0FB50-0FDFF.el
index a39ae4700be..87b83cfff06 100644
--- a/lisp/nxml/char-name/unicode/0FB50-0FDFF.el
+++ b/lisp/nxml/char-name/unicode/0FB50-0FDFF.el
@@ -594,3 +594,5 @@
     ("ARABIC LIGATURE JALLAJALALOUHOU" #xFDFB)
     ("RIAL SIGN" #xFDFC)
     ))
+
+;; arch-tag: 1fbfd997-096a-43c8-88a1-9d438ddabb57
diff --git a/lisp/nxml/char-name/unicode/0FE00-0FE0F.el b/lisp/nxml/char-name/unicode/0FE00-0FE0F.el
index f1eb897599b..187b58d4e6b 100644
--- a/lisp/nxml/char-name/unicode/0FE00-0FE0F.el
+++ b/lisp/nxml/char-name/unicode/0FE00-0FE0F.el
@@ -16,3 +16,5 @@
     ("VARIATION SELECTOR-15" #xFE0E)
     ("VARIATION SELECTOR-16" #xFE0F)
     ))
+
+;; arch-tag: 591c3457-10c0-4036-8bfb-6cccd23f44dd
diff --git a/lisp/nxml/char-name/unicode/0FE20-0FE2F.el b/lisp/nxml/char-name/unicode/0FE20-0FE2F.el
index 2cc5ef2bb05..358dccd061e 100644
--- a/lisp/nxml/char-name/unicode/0FE20-0FE2F.el
+++ b/lisp/nxml/char-name/unicode/0FE20-0FE2F.el
@@ -4,3 +4,5 @@
     ("COMBINING DOUBLE TILDE LEFT HALF" #xFE22)
     ("COMBINING DOUBLE TILDE RIGHT HALF" #xFE23)
     ))
+
+;; arch-tag: de291a34-737a-4bbb-8d97-94f878921d05
diff --git a/lisp/nxml/char-name/unicode/0FE30-0FE4F.el b/lisp/nxml/char-name/unicode/0FE30-0FE4F.el
index 83893e4b936..b7fe8c00d64 100644
--- a/lisp/nxml/char-name/unicode/0FE30-0FE4F.el
+++ b/lisp/nxml/char-name/unicode/0FE30-0FE4F.el
@@ -30,3 +30,5 @@
     ("CENTRELINE LOW LINE" #xFE4E)
     ("WAVY LOW LINE" #xFE4F)
     ))
+
+;; arch-tag: 6d8f4c10-304f-4d0b-b830-1e37a8386015
diff --git a/lisp/nxml/char-name/unicode/0FE50-0FE6F.el b/lisp/nxml/char-name/unicode/0FE50-0FE6F.el
index d94cc453f4f..966d5a21c43 100644
--- a/lisp/nxml/char-name/unicode/0FE50-0FE6F.el
+++ b/lisp/nxml/char-name/unicode/0FE50-0FE6F.el
@@ -26,3 +26,5 @@
     ("SMALL PERCENT SIGN" #xFE6A)
     ("SMALL COMMERCIAL AT" #xFE6B)
     ))
+
+;; arch-tag: 4facf8e4-cea2-4194-bc17-f0959c358f7f
diff --git a/lisp/nxml/char-name/unicode/0FE70-0FEFF.el b/lisp/nxml/char-name/unicode/0FE70-0FEFF.el
index d0e54b64ec1..07b03dadc7a 100644
--- a/lisp/nxml/char-name/unicode/0FE70-0FEFF.el
+++ b/lisp/nxml/char-name/unicode/0FE70-0FEFF.el
@@ -141,3 +141,5 @@
     ("ARABIC LIGATURE LAM WITH ALEF FINAL FORM" #xFEFC)
     ("ZERO WIDTH NO-BREAK SPACE" #xFEFF)
     ))
+
+;; arch-tag: cdc72129-3cd8-4568-8366-c0deee767c17
diff --git a/lisp/nxml/char-name/unicode/0FF00-0FFEF.el b/lisp/nxml/char-name/unicode/0FF00-0FFEF.el
index 004f043c19b..fb8dd897f19 100644
--- a/lisp/nxml/char-name/unicode/0FF00-0FFEF.el
+++ b/lisp/nxml/char-name/unicode/0FF00-0FFEF.el
@@ -225,3 +225,5 @@
     ("HALFWIDTH BLACK SQUARE" #xFFED)
     ("HALFWIDTH WHITE CIRCLE" #xFFEE)
     ))
+
+;; arch-tag: 8af7a95d-6e71-47da-9679-b516b6e2f01a
diff --git a/lisp/nxml/char-name/unicode/0FFF0-0FFFF.el b/lisp/nxml/char-name/unicode/0FFF0-0FFFF.el
index f381a28e05a..392312be01e 100644
--- a/lisp/nxml/char-name/unicode/0FFF0-0FFFF.el
+++ b/lisp/nxml/char-name/unicode/0FFF0-0FFFF.el
@@ -5,3 +5,5 @@
     ("OBJECT REPLACEMENT CHARACTER" #xFFFC)
     ("REPLACEMENT CHARACTER" #xFFFD)
     ))
+
+;; arch-tag: 0bef6e81-4857-4032-a18a-18784233cc81
diff --git a/lisp/nxml/char-name/unicode/10300-1032F.el b/lisp/nxml/char-name/unicode/10300-1032F.el
index fbb5cb8f253..95d26005525 100644
--- a/lisp/nxml/char-name/unicode/10300-1032F.el
+++ b/lisp/nxml/char-name/unicode/10300-1032F.el
@@ -35,3 +35,5 @@
     ("OLD ITALIC NUMERAL TEN" #x10322)
     ("OLD ITALIC NUMERAL FIFTY" #x10323)
     ))
+
+;; arch-tag: 823cbcc4-a815-4f82-a1e9-348c2f5d237e
diff --git a/lisp/nxml/char-name/unicode/10330-1034F.el b/lisp/nxml/char-name/unicode/10330-1034F.el
index 38ba2988a4c..edd9de4050c 100644
--- a/lisp/nxml/char-name/unicode/10330-1034F.el
+++ b/lisp/nxml/char-name/unicode/10330-1034F.el
@@ -27,3 +27,5 @@
     ("GOTHIC LETTER OTHAL" #x10349)
     ("GOTHIC LETTER NINE HUNDRED" #x1034A)
     ))
+
+;; arch-tag: 29caddb6-76f0-44bc-83f9-6cef55c20600
diff --git a/lisp/nxml/char-name/unicode/10400-1044F.el b/lisp/nxml/char-name/unicode/10400-1044F.el
index 1637cf666bf..a26005a3953 100644
--- a/lisp/nxml/char-name/unicode/10400-1044F.el
+++ b/lisp/nxml/char-name/unicode/10400-1044F.el
@@ -76,3 +76,5 @@
     ("DESERET SMALL LETTER EN" #x1044C)
     ("DESERET SMALL LETTER ENG" #x1044D)
     ))
+
+;; arch-tag: 0fbf6586-41cf-41b2-88e9-d113db5d933e
diff --git a/lisp/nxml/char-name/unicode/1D000-1D0FF.el b/lisp/nxml/char-name/unicode/1D000-1D0FF.el
index f1a6f36dff7..1c76fd0eff0 100644
--- a/lisp/nxml/char-name/unicode/1D000-1D0FF.el
+++ b/lisp/nxml/char-name/unicode/1D000-1D0FF.el
@@ -246,3 +246,5 @@
     ("BYZANTINE MUSICAL SYMBOL KLASMA KATO" #x1D0F4)
     ("BYZANTINE MUSICAL SYMBOL GORGON NEO KATO" #x1D0F5)
     ))
+
+;; arch-tag: 2b360fc3-2760-43c9-9d3e-2ef3fd8452b5
diff --git a/lisp/nxml/char-name/unicode/1D100-1D1FF.el b/lisp/nxml/char-name/unicode/1D100-1D1FF.el
index 29803dd0a7d..1bfbf2608dd 100644
--- a/lisp/nxml/char-name/unicode/1D100-1D1FF.el
+++ b/lisp/nxml/char-name/unicode/1D100-1D1FF.el
@@ -219,3 +219,5 @@
     ("MUSICAL SYMBOL TORCULUS RESUPINUS" #x1D1DC)
     ("MUSICAL SYMBOL PES SUBPUNCTIS" #x1D1DD)
     ))
+
+;; arch-tag: 4e6bd082-bedb-46a2-81be-06f86fbb74f4
diff --git a/lisp/nxml/char-name/unicode/1D400-1D7FF.el b/lisp/nxml/char-name/unicode/1D400-1D7FF.el
index 98e8c2382cd..f702765c55f 100644
--- a/lisp/nxml/char-name/unicode/1D400-1D7FF.el
+++ b/lisp/nxml/char-name/unicode/1D400-1D7FF.el
@@ -991,3 +991,5 @@
     ("MATHEMATICAL MONOSPACE DIGIT EIGHT" #x1D7FE)
     ("MATHEMATICAL MONOSPACE DIGIT NINE" #x1D7FF)
     ))
+
+;; arch-tag: af730f58-d05e-4cd5-8a94-f914444a5351
diff --git a/lisp/nxml/char-name/unicode/E0000-E007F.el b/lisp/nxml/char-name/unicode/E0000-E007F.el
index b4aeb1fd2b4..1f4da35df29 100644
--- a/lisp/nxml/char-name/unicode/E0000-E007F.el
+++ b/lisp/nxml/char-name/unicode/E0000-E007F.el
@@ -97,3 +97,5 @@
     ("TAG TILDE" #xE007E)
     ("CANCEL TAG" #xE007F)
     ))
+
+;; arch-tag: e79cd51a-999f-4f8c-8f11-a5eeb5c2de4c
diff --git a/lisp/nxml/nxml-enc.el b/lisp/nxml/nxml-enc.el
index ba75580301a..350d7e7ce3b 100644
--- a/lisp/nxml/nxml-enc.el
+++ b/lisp/nxml/nxml-enc.el
@@ -164,4 +164,5 @@ Applied to any files that `auto-mode-alist' says should be handled by
 
 (provide 'nxml-enc)
 
+;; arch-tag: c2436247-78f3-418c-8069-85dc5335d083
 ;;; nxml-enc.el ends here
diff --git a/lisp/nxml/nxml-glyph.el b/lisp/nxml/nxml-glyph.el
index b5a70b2694b..5146d15452a 100644
--- a/lisp/nxml/nxml-glyph.el
+++ b/lisp/nxml/nxml-glyph.el
@@ -415,4 +415,5 @@ Return nil if the face cannot display a glyph for N."
 
 (provide 'nxml-glyph)
 
+;; arch-tag: 50985104-27c6-4241-8625-b11aa5685633
 ;;; nxml-glyph.el ends here
diff --git a/lisp/nxml/nxml-maint.el b/lisp/nxml/nxml-maint.el
index 015c0c7dadf..077524c8b5c 100644
--- a/lisp/nxml/nxml-maint.el
+++ b/lisp/nxml/nxml-maint.el
@@ -103,4 +103,5 @@
 
 (provide 'nxml-maint)
 
+;; arch-tag: 2cff6b55-12af-47db-90da-a91f782f435a
 ;;; nxml-maint.el ends here
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 821b40621f0..ee08fe9b222 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -2662,4 +2662,5 @@ With a prefix argument, inserts the character directly."
 
 (provide 'nxml-mode)
 
+;; arch-tag: 8603bc5f-1ef9-4021-b223-322fb2ca708e
 ;;; nxml-mode.el ends here
diff --git a/lisp/nxml/nxml-ns.el b/lisp/nxml/nxml-ns.el
index 6306d93713a..0b705bdff12 100644
--- a/lisp/nxml/nxml-ns.el
+++ b/lisp/nxml/nxml-ns.el
@@ -145,4 +145,5 @@ NS is a symbol or nil."
     
 (provide 'nxml-ns)
 
+;; arch-tag: 5968e4b7-fb37-46ce-8621-c65db9793028
 ;;; nxml-ns.el ends here
diff --git a/lisp/nxml/nxml-outln.el b/lisp/nxml/nxml-outln.el
index 5bc39c86e83..7488a13bc38 100644
--- a/lisp/nxml/nxml-outln.el
+++ b/lisp/nxml/nxml-outln.el
@@ -1037,4 +1037,5 @@ immediately after the section's start-tag."
 
 (provide 'nxml-outln)
 
+;; arch-tag: 1f1b7454-e573-4cd7-a505-d9dc64eef828
 ;;; nxml-outln.el ends here
diff --git a/lisp/nxml/nxml-parse.el b/lisp/nxml/nxml-parse.el
index 0e93f10103a..fe9665d5770 100644
--- a/lisp/nxml/nxml-parse.el
+++ b/lisp/nxml/nxml-parse.el
@@ -317,4 +317,5 @@ in the same way as well-formedness error."
 
 (provide 'nxml-parse)
 
+;; arch-tag: fc19639b-1bff-4673-9992-f539da89ba1e
 ;;; nxml-parse.el ends here
diff --git a/lisp/nxml/nxml-rap.el b/lisp/nxml/nxml-rap.el
index 8b0c55e573e..6df783343de 100644
--- a/lisp/nxml/nxml-rap.el
+++ b/lisp/nxml/nxml-rap.el
@@ -464,4 +464,5 @@ expected `%s'"
 
 (provide 'nxml-rap)
 
+;; arch-tag: cba241ec-4c59-4ef3-aa51-2cf92b3dd24f
 ;;; nxml-rap.el ends here
diff --git a/lisp/nxml/nxml-uchnm.el b/lisp/nxml/nxml-uchnm.el
index fbb60745159..62f46c5ad5d 100644
--- a/lisp/nxml/nxml-uchnm.el
+++ b/lisp/nxml/nxml-uchnm.el
@@ -254,4 +254,5 @@ the variable `nxml-enabled-unicode-blocks'."
 
 (provide 'nxml-uchnm)
 
+;; arch-tag: 440248c3-b604-467c-8b50-e83662c659a3
 ;;; nxml-uchnm.el ends here
diff --git a/lisp/nxml/nxml-util.el b/lisp/nxml/nxml-util.el
index 070bdf8ea99..1abb6e6c19c 100644
--- a/lisp/nxml/nxml-util.el
+++ b/lisp/nxml/nxml-util.el
@@ -97,4 +97,5 @@ modifications to the buffer."
 
 (provide 'nxml-util)
 
+;; arch-tag: 7d3b3af4-de2b-4410-bf67-94d64824324b
 ;;; nxml-util.el ends here
diff --git a/lisp/nxml/rng-cmpct.el b/lisp/nxml/rng-cmpct.el
index 29699b60122..578ca8c9fe6 100644
--- a/lisp/nxml/rng-cmpct.el
+++ b/lisp/nxml/rng-cmpct.el
@@ -935,3 +935,5 @@ parse is token following ]."
 (provide 'rng-cmpct)
 
 ;;; rng-cmpct.el
+
+;; arch-tag: 90395eb1-283b-4146-bbc1-6d6ef1704e57
diff --git a/lisp/nxml/rng-dt.el b/lisp/nxml/rng-dt.el
index ba0689130ce..6c725223388 100644
--- a/lisp/nxml/rng-dt.el
+++ b/lisp/nxml/rng-dt.el
@@ -61,4 +61,5 @@ library.")
 
 (provide 'rng-dt)
 
+;; arch-tag: 1dca90f1-8dae-4dd4-b61f-fade4452c014
 ;;; rng-dt.el ends here
diff --git a/lisp/nxml/rng-loc.el b/lisp/nxml/rng-loc.el
index b81bfe009f8..ad3f427d641 100644
--- a/lisp/nxml/rng-loc.el
+++ b/lisp/nxml/rng-loc.el
@@ -545,4 +545,5 @@ saved to the first writable file in `rng-schema-locating-files'."
 
 (provide 'rng-loc)
 
+;; arch-tag: 725cf968-37a2-418b-b47b-d5209871a9ab
 ;;; rng-loc.el ends here
diff --git a/lisp/nxml/rng-maint.el b/lisp/nxml/rng-maint.el
index ecf1ff1bc99..932671442eb 100644
--- a/lisp/nxml/rng-maint.el
+++ b/lisp/nxml/rng-maint.el
@@ -340,4 +340,5 @@
   (while (rng-do-some-validation
 	  (lambda () t))))
 
+;; arch-tag: 4b8c6143-daac-4888-9c61-9bea6f935f17
 ;;; rng-maint.el ends here
diff --git a/lisp/nxml/rng-match.el b/lisp/nxml/rng-match.el
index d3692615549..657348f2a9d 100644
--- a/lisp/nxml/rng-match.el
+++ b/lisp/nxml/rng-match.el
@@ -1736,4 +1736,5 @@ be exhaustive."
 
 (provide 'rng-match)
     
+;; arch-tag: c8c50733-edcf-49fb-85e2-0aac8749b7f8
 ;;; rng-match.el ends here
diff --git a/lisp/nxml/rng-nxml.el b/lisp/nxml/rng-nxml.el
index 46867a62545..5ac2258b3bb 100644
--- a/lisp/nxml/rng-nxml.el
+++ b/lisp/nxml/rng-nxml.el
@@ -588,4 +588,5 @@ set `xmltok-dtd'. Returns the position of the end of the token."
 
 (provide 'rng-nxml)
 
+;; arch-tag: bec0d6ed-6be1-4540-9c2c-6f56e8e55d8b
 ;;; rng-nxml.el ends here
diff --git a/lisp/nxml/rng-parse.el b/lisp/nxml/rng-parse.el
index f4a0a4cc4c6..82c812f51cb 100644
--- a/lisp/nxml/rng-parse.el
+++ b/lisp/nxml/rng-parse.el
@@ -101,4 +101,5 @@ be signaled in the same way as when it is not well-formed."
 
 (provide 'rng-parse)
 
+;; arch-tag: 8f14f533-b687-4dc0-9cd7-617ead856981
 ;;; rng-parse.el ends here
diff --git a/lisp/nxml/rng-pttrn.el b/lisp/nxml/rng-pttrn.el
index c3ae4c6812b..bdcacd22031 100644
--- a/lisp/nxml/rng-pttrn.el
+++ b/lisp/nxml/rng-pttrn.el
@@ -186,4 +186,5 @@
 
 (provide 'rng-pttrn)
 
+;; arch-tag: 9418e269-ddd4-4037-861f-ff903f48f008
 ;;; rng-pttrn.el ends here
diff --git a/lisp/nxml/rng-uri.el b/lisp/nxml/rng-uri.el
index 7ed8befc90e..284fa2495f5 100644
--- a/lisp/nxml/rng-uri.el
+++ b/lisp/nxml/rng-uri.el
@@ -352,4 +352,5 @@ Both FULL and BASE must be absolute URIs."
 
 (provide 'rng-uri)
 
+;; arch-tag: c7b7b8b8-61d1-48ec-82bc-7001c70b2e9d
 ;;; rng-uri.el ends here
diff --git a/lisp/nxml/rng-util.el b/lisp/nxml/rng-util.el
index 865da0ff70c..16b72c5253e 100644
--- a/lisp/nxml/rng-util.el
+++ b/lisp/nxml/rng-util.el
@@ -169,4 +169,5 @@ HIST, if non-nil, specifies a history list as with `completing-read'."
 
 (provide 'rng-util)
 
+;; arch-tag: 2dc233e0-5e7a-488f-bfc4-5909512dbaf0
 ;;; rng-util.el ends here
diff --git a/lisp/nxml/rng-valid.el b/lisp/nxml/rng-valid.el
index d5ecb3aae00..c45eb7b8993 100644
--- a/lisp/nxml/rng-valid.el
+++ b/lisp/nxml/rng-valid.el
@@ -1464,4 +1464,5 @@ string between START and END."
 
 (provide 'rng-valid)
 
+;; arch-tag: 7dd846d3-519d-4a6d-8107-4ff0024a60ef
 ;;; rng-valid.el ends here
diff --git a/lisp/nxml/rng-xsd.el b/lisp/nxml/rng-xsd.el
index 65091ef8795..b5b259b9d9d 100644
--- a/lisp/nxml/rng-xsd.el
+++ b/lisp/nxml/rng-xsd.el
@@ -855,4 +855,5 @@ MONTHS must be an integer >= 0."
 
 (provide 'rng-xsd)
 
+;; arch-tag: 6b05510e-a5bb-4b99-8618-4660d00d0abb
 ;;; rng-xsd.el ends here
diff --git a/lisp/nxml/test.invalid.xml b/lisp/nxml/test.invalid.xml
index bdf6a2cb7ee..87a0031f8e7 100644
--- a/lisp/nxml/test.invalid.xml
+++ b/lisp/nxml/test.invalid.xml
@@ -6,3 +6,6 @@
     <p>This XHTML document is <span class="#foo">invalid</span>.</p>
   </body>
 </html>
+
+<!-- arch-tag: 8127c8be-d617-46f5-bdf2-c9159a417c38
+     (do not change this comment) -->
diff --git a/lisp/nxml/test.valid.xml b/lisp/nxml/test.valid.xml
index 56a12800faa..c11380a0e41 100644
--- a/lisp/nxml/test.valid.xml
+++ b/lisp/nxml/test.valid.xml
@@ -6,3 +6,6 @@
     <p>This is a valid, albeit boring, XHTML document.</p>
   </body>
 </html>
+
+<!-- arch-tag: 6f7701be-ec51-48d0-bb63-38ed564718d6
+     (do not change this comment) -->
diff --git a/lisp/nxml/xmltok.el b/lisp/nxml/xmltok.el
index ed381cd4cc9..a7fd27c6500 100644
--- a/lisp/nxml/xmltok.el
+++ b/lisp/nxml/xmltok.el
@@ -1922,4 +1922,5 @@ and `xmltok-namespace-attributes'."
 
 (provide 'xmltok)
 
+;; arch-tag: 747e5f3a-6fc3-4f8d-bd96-89f05aa99f5e
 ;;; xmltok.el ends here
diff --git a/lisp/nxml/xsd-regexp.el b/lisp/nxml/xsd-regexp.el
index 3f12c5576a6..6dbb6a74dd8 100644
--- a/lisp/nxml/xsd-regexp.el
+++ b/lisp/nxml/xsd-regexp.el
@@ -2118,4 +2118,5 @@ Code is inserted into the current buffer."
 
 (provide 'xsd-regexp)
 
+;; arch-tag: bf990d61-a26c-4fd3-b578-56a5640729da
 ;;; xsd-regexp.el ends here