diff --git a/xmlmapfile/mapfile.xsd b/xmlmapfile/mapfile.xsd
index e2df4c1289..a55137576a 100644
--- a/xmlmapfile/mapfile.xsd
+++ b/xmlmapfile/mapfile.xsd
@@ -193,6 +193,7 @@
+
@@ -207,6 +208,7 @@
+
@@ -389,6 +391,7 @@
+
@@ -425,6 +428,11 @@
+
+
+
+
+
@@ -468,6 +476,7 @@
+
@@ -630,6 +639,7 @@
+
diff --git a/xmlmapfile/mapfile.xsl b/xmlmapfile/mapfile.xsl
index f5fe59458e..2a6cb8780e 100644
--- a/xmlmapfile/mapfile.xsl
+++ b/xmlmapfile/mapfile.xsl
@@ -175,7 +175,7 @@
-
+
@@ -783,6 +783,10 @@
+
+
+
+
@@ -818,6 +822,10 @@
+
+
+
+
@@ -963,6 +971,9 @@
+
+
+
@@ -1251,6 +1262,10 @@
+
+
+
+
diff --git a/xmlmapfile/tests/layerset.xml b/xmlmapfile/tests/layerset.xml
index 93cb9671f7..fc75092bdd 100644
--- a/xmlmapfile/tests/layerset.xml
+++ b/xmlmapfile/tests/layerset.xml
@@ -17,6 +17,7 @@
ISO 8859-1
serif
TRUE
+ layerName
244
244
24
diff --git a/xmlmapfile/tests/mapfile-test.xml b/xmlmapfile/tests/mapfile-test.xml
index ecf5c6bee6..9b36d2743a 100644
--- a/xmlmapfile/tests/mapfile-test.xml
+++ b/xmlmapfile/tests/mapfile-test.xml
@@ -126,6 +126,8 @@
SMALL
\n
@@ -141,6 +143,7 @@
/tmp/mySymbolSet.sym
+
FALSE
C
TRUE