Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 18632)
+++ trunk/resources/data/defaultpresets.xml	(revision 18633)
@@ -7030,5 +7030,5 @@
             <space />
             <key key="historic" value="archaeological_site" />
-            <combo key="site_type" text="Type" values="tumulus,megalith,fortification,settlement,necropolis,city" />
+            <combo key="archaeological_site" text="Type" values="baths,catacombs,city,crannog,enclosure,fortification,geoglyph,grave_field,petroglyph,hut_circle,megalith,necropolis,roman_circus,roman_theater,roman_villa,settlement,tumulus" />
             <reference ref="name_oh_wheelchair" />
         </item> <!-- Archaeological Site -->
Index: trunk/resources/data/validator/combinations.mapcss
===================================================================
--- trunk/resources/data/validator/combinations.mapcss	(revision 18632)
+++ trunk/resources/data/validator/combinations.mapcss	(revision 18633)
@@ -107,5 +107,5 @@
 node[lamp_type                 ][highway!=street_lamp],
 node[map_type                  ][information!=map],
-*[site_type                    ][historic!=archaeological_site],
+*[archaeological_site          ][historic!=archaeological_site],
 *[artwork_type                 ][tourism!=artwork][exhibit!=artwork],
 *[castle_type                  ][historic!=castle],
Index: trunk/resources/data/validator/deprecated.mapcss
===================================================================
--- trunk/resources/data/validator/deprecated.mapcss	(revision 18632)
+++ trunk/resources/data/validator/deprecated.mapcss	(revision 18633)
@@ -2402,5 +2402,5 @@
 }
 
-/* temporary URLs, can be exteded to other websites and other keys e.g. "url" or "website", #22397 */
+/* temporary URLs, can be extended to other websites and other keys e.g. "url" or "website", #22397 */
 *[image][image=~/^https:\/\/westnordost.de\/p\//] {
   throwWarning: tr("{0} with a temporary URL which may be outdated very soon", "{0.key}");
@@ -2411,3 +2411,11 @@
 }
 
+/* Replaced by archaeological_site, see #22561 */
+*[historic=archaeological_site][site_type] {
+  throwWarning: tr("{0} should be replaced with {1}", "{1.key}", "archaeological_site");
+  fixChangeKey: "site_type => archaeological_site";
+  assertMatch: "node historic=archaeological_site site_type=fortification";
+  assertNoMatch: "node historic=archaeological_site site_type2=fortification";
+}
+
 /* When tags are deprecated they should be added to ignoretags.cfg too. */
Index: trunk/resources/data/validator/ignoretags.cfg
===================================================================
--- trunk/resources/data/validator/ignoretags.cfg	(revision 18632)
+++ trunk/resources/data/validator/ignoretags.cfg	(revision 18633)
@@ -732,4 +732,5 @@
 K:type=turnlanes:turns
 K:surface=paving_stones:30
+E:site_type
 ;
 ; Tags not yet decided (to remove from this section when added or moved up when deprecated)