Index: boot/common/e2fsprogs.xml
===================================================================
--- boot/common/e2fsprogs.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/common/e2fsprogs.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -44,9 +44,9 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='l'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='m'])"/>
+      xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>
Index: boot/common/inetutils.xml
===================================================================
--- boot/common/inetutils.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/common/inetutils.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,17 +25,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/common/util-linux.xml
===================================================================
--- boot/common/util-linux.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/common/util-linux.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,17 +25,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <para os="ba">Util-linux does not use the freshly installed headers and
@@ -55,5 +55,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="be"><userinput>./configure</userinput></screen>
@@ -61,5 +61,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
 <screen os="bf"><userinput>make HAVE_KILL=yes HAVE_SLN=yes \
@@ -72,9 +72,9 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(//*[@os='fa'])"/>
+      xpointer="xpointer(//*[@os='e1'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/util-linux.xml"
-      xpointer="xpointer(//*[@os='fb'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <varlistentry>
Index: boot/mips/module-init-tools.xml
===================================================================
--- boot/mips/module-init-tools.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/mips/module-init-tools.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,9 +25,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/module-init-tools.xml
===================================================================
--- boot/mips64/module-init-tools.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/mips64/module-init-tools.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,9 +25,9 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m1'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../mips/module-init-tools.xml"
-    xpointer="xpointer(//*[@os='m2'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/mips64/util-linux.xml
===================================================================
--- boot/mips64/util-linux.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/mips64/util-linux.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,25 +25,25 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='aa'])"/>
+    xpointer="xpointer(//*[@os='p5'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../../final-system/mips64/util-linux.xml"
-    xpointer="xpointer(//*[@os='ab'])"/>
+    xpointer="xpointer(//*[@os='p6'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -65,5 +65,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -73,5 +73,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/multilib/inetutils.xml
===================================================================
--- boot/multilib/inetutils.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/multilib/inetutils.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,17 +25,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/inetutils.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/multilib/util-linux.xml
===================================================================
--- boot/multilib/util-linux.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/multilib/util-linux.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -25,17 +25,17 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='a'])"/>
+    xpointer="xpointer(//*[@os='p1'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b'])"/>
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b1'])"/>
+    xpointer="xpointer(//*[@os='p3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='b2'])"/>
+    xpointer="xpointer(//*[@os='p4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
@@ -57,5 +57,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='c'])"/>
+    xpointer="xpointer(//*[@os='a'])"/>
 
 <screen os="be"><userinput>CC="${CC} ${BUILD64}" ./configure</userinput></screen>
@@ -63,5 +63,5 @@
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
     href="../common/util-linux.xml"
-    xpointer="xpointer(//*[@os='d'])"/>
+    xpointer="xpointer(//*[@os='c'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
Index: boot/sparc64/e2fsprogs-libs.xml
===================================================================
--- boot/sparc64/e2fsprogs-libs.xml	(revision b66e30f5c18ae90b6c5cd4aadbece48d2d65a7ab)
+++ boot/sparc64/e2fsprogs-libs.xml	(revision e6423a0173a056b61609735890f8c57006ad11a0)
@@ -44,9 +44,9 @@
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='l'])"/>
+      xpointer="xpointer(//*[@os='e2'])"/>
 
       <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
       href="../../final-system/common/e2fsprogs.xml"
-      xpointer="xpointer(//*[@os='m'])"/>
+      xpointer="xpointer(//*[@os='e3'])"/>
 
     </variablelist>
