diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 8037c3256..c577cedcd 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 82af97798..b75c4a9f2 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -37,6 +37,7 @@
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/intel_aub.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
@@ -147,7 +148,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 9796bc6e3..5e88afb97 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 9796bc6e3..5e88afb97 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.aviion b/distrib/sets/lists/xbase/md.aviion
index 8037c3256..c577cedcd 100644
--- a/distrib/sets/lists/xbase/md.aviion
+++ b/distrib/sets/lists/xbase/md.aviion
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 215c08cd3..9a6a2c0ef 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -101,7 +101,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 7510472fd..322f48ec5 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -37,6 +37,7 @@
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/X11/extensions/dri2proto.h
 ./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/intel_aub.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/pixman-1/pixman-version.h
 ./usr/X11R6/include/pixman-1/pixman.h
@@ -147,7 +148,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 92208f8f0..7015e845e 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -101,7 +101,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index fa7483822..65e3ee78f 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 8037c3256..c577cedcd 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index dcd2a5504..1fe99bb77 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index a071a4061..667151d04 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -46,7 +46,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
 ./usr/X11R6/lib/libxcb-cursor.la
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 5dd9dbd7d..896a5e52d 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 9796bc6e3..5e88afb97 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 9796bc6e3..5e88afb97 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index f90571135..7377a2b6b 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -138,7 +138,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 6a104edf6..705a6d8bb 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -137,7 +137,7 @@
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.32.4
+./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 996a24caa..c1b83fee0 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -341,3 +341,5 @@
 ./var/cache
 ./var/cache/fontconfig
 ./var/cache/fontconfig/CACHEDIR.TAG
+./var/db/sysmerge
+./var/db/sysmerge/xetcsum