Index: trunk/data/validator/geometry.mapcss
===================================================================
--- trunk/data/validator/geometry.mapcss	(revision 13082)
+++ trunk/data/validator/geometry.mapcss	(revision 13083)
@@ -46,4 +46,9 @@
   assertMatch: "node bridge=yes";
   assertMatch: "node bridge=viaduct";
+}
+
+/* {0} on a node, should be a way or relation */
+node[boundary=administrative] {
+  throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}");
 }
 
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 13082)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 13083)
@@ -4425,8 +4425,8 @@
     dashes: 9,9;
 }
-way[admin_level=9]::core_boundary,
-relation[admin_level=9] > way::core_boundary,
-way[admin_level=10]::core_boundary,
-relation[admin_level=10] > way::core_boundary {
+way[boundary=administrative][admin_level=9]::core_boundary,
+relation[boundary=administrative][admin_level=9] > way::core_boundary,
+way[boundary=administrative][admin_level=10]::core_boundary,
+relation[boundary=administrative][admin_level=10] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4435,8 +4435,8 @@
     dashes: 9,9;
 }
-way[admin_level=7]::core_boundary,
-relation[admin_level=7] > way::core_boundary,
-way[admin_level=8]::core_boundary,
-relation[admin_level=8] > way::core_boundary {
+way[boundary=administrative][admin_level=7]::core_boundary,
+relation[boundary=administrative][admin_level=7] > way::core_boundary,
+way[boundary=administrative][admin_level=8]::core_boundary,
+relation[boundary=administrative][admin_level=8] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4445,8 +4445,8 @@
     dashes: 9,9;
 }
-way[admin_level=5]::core_boundary,
-relation[admin_level=5] > way::core_boundary,
-way[admin_level=6]::core_boundary,
-relation[admin_level=6] > way::core_boundary {
+way[boundary=administrative][admin_level=5]::core_boundary,
+relation[boundary=administrative][admin_level=5] > way::core_boundary,
+way[boundary=administrative][admin_level=6]::core_boundary,
+relation[boundary=administrative][admin_level=6] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4455,8 +4455,8 @@
     dashes: 9,9;
 }
-way[admin_level=3]::core_boundary,
-relation[admin_level=3] > way::core_boundary,
-way[admin_level=4]::core_boundary,
-relation[admin_level=4] > way::core_boundary {
+way[boundary=administrative][admin_level=3]::core_boundary,
+relation[boundary=administrative][admin_level=3] > way::core_boundary,
+way[boundary=administrative][admin_level=4]::core_boundary,
+relation[boundary=administrative][admin_level=4] > way::core_boundary {
     z-index: 2;
     modifier: false;
@@ -4465,8 +4465,8 @@
     dashes: 9,9;
 }
-way[admin_level=1]::core_boundary,
-relation[admin_level=1] > way::core_boundary,
-way[admin_level=2]::core_boundary,
-relation[admin_level=2] > way::core_boundary {
+way[boundary=administrative][admin_level=1]::core_boundary,
+relation[boundary=administrative][admin_level=1] > way::core_boundary,
+way[boundary=administrative][admin_level=2]::core_boundary,
+relation[boundary=administrative][admin_level=2] > way::core_boundary {
     z-index: 2;
     modifier: false;