diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 651bf93fd76e..80ef92b51015 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.90 2010/05/22 23:03:13 mrg Exp $
+# $NetBSD: mi,v 1.91 2010/05/22 23:19:44 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1506,6 +1506,7 @@
 ./usr/X11R7/include/X11/pixmaps/xorg.xpm		-unknown-	xorg
 ./usr/X11R7/include/drm					base-x11-root	obsolete
 ./usr/X11R7/include/libdrm				base-x11-root	xorg
+./usr/X11R7/include/libkms				base-x11-root	xorg
 ./usr/X11R7/include/fontconfig				base-x11-root	xorg
 ./usr/X11R7/include/freetype2				base-x11-root	xorg
 ./usr/X11R7/include/freetype2/freetype			base-x11-root	xorg
diff --git a/distrib/sets/lists/xbase/shl.elf b/distrib/sets/lists/xbase/shl.elf
index ae11d584a783..615d83da78b8 100644
--- a/distrib/sets/lists/xbase/shl.elf
+++ b/distrib/sets/lists/xbase/shl.elf
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.28 2010/05/22 23:03:13 mrg Exp $
+# $NetBSD: shl.elf,v 1.29 2010/05/22 23:19:44 mrg Exp $
 ./usr/X11R6/lib/X11/locale/lib/common/ximcp.so.2	-unknown-		x11
 ./usr/X11R6/lib/X11/locale/lib/common/xlcDef.so.2	-unknown-		x11
 ./usr/X11R6/lib/X11/locale/lib/common/xlcUTF8Load.so.2	-unknown-		x11
@@ -198,7 +198,7 @@
 ./usr/X11R7/lib/libdrm.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm.so.3			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_radeon.so		-unknown-		xorg
-./usr/X11R7/lib/libdrm_radeon.so.3		-unknown-		xorg
+./usr/X11R7/lib/libdrm_radeon.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libexpat.so			-unknown-		xorg
 ./usr/X11R7/lib/libexpat.so.2			-unknown-		xorg
 ./usr/X11R7/lib/libfontconfig.so		-unknown-		xorg
diff --git a/distrib/sets/lists/xcomp/md.amd64 b/distrib/sets/lists/xcomp/md.amd64
index 4b821c4b358a..855f239434ba 100644
--- a/distrib/sets/lists/xcomp/md.amd64
+++ b/distrib/sets/lists/xcomp/md.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.22 2010/05/22 21:12:29 mrg Exp $
+# $NetBSD: md.amd64,v 1.23 2010/05/22 23:19:45 mrg Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -70,7 +70,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3		-unknown-	.man,x11
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,x11
 ./usr/X11R6/man/man4/fpit.4				-unknown-	.man,x11
-./usr/X11R7/include/intel_bufmgr.h			-unknown-	xorg
+./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/lib/libdrm_intel.a				-unknown-	xorg
 ./usr/X11R7/lib/libdrm_intel_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libdrm_intel_p.a			-unknown-	profile,xorg
diff --git a/distrib/sets/lists/xcomp/md.i386 b/distrib/sets/lists/xcomp/md.i386
index 77c3be38f572..5a14bfe00165 100644
--- a/distrib/sets/lists/xcomp/md.i386
+++ b/distrib/sets/lists/xcomp/md.i386
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.28 2010/05/22 21:12:29 mrg Exp $
+# $NetBSD: md.i386,v 1.29 2010/05/22 23:19:45 mrg Exp $
 ./usr/X11R6/include/xf86Optrec.h			-unknown-	x11
 ./usr/X11R6/include/xf86Parser.h			-unknown-	x11
 ./usr/X11R6/man/cat3/XF86VidMode.0			-unknown-	.cat,x11
@@ -70,7 +70,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3		-unknown-	.man,x11
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3	-unknown-	.man,x11
 ./usr/X11R6/man/man4/fpit.4				-unknown-	.man,x11
-./usr/X11R7/include/intel_bufmgr.h			-unknown-	xorg
+./usr/X11R7/include/intel_bufmgr.h			-unknown-	obsolete
 ./usr/X11R7/lib/libdrm_intel.a				-unknown-	xorg
 ./usr/X11R7/lib/libdrm_intel_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libdrm_intel_p.a			-unknown-	profile,xorg
diff --git a/distrib/sets/lists/xcomp/mi b/distrib/sets/lists/xcomp/mi
index 7e895389195a..cc7b1971ff45 100644
--- a/distrib/sets/lists/xcomp/mi
+++ b/distrib/sets/lists/xcomp/mi
@@ -1,4 +1,4 @@
-#	 $NetBSD: mi,v 1.105 2010/05/22 23:03:13 mrg Exp $
+#	 $NetBSD: mi,v 1.106 2010/05/22 23:19:45 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -6215,6 +6215,9 @@
 ./usr/X11R7/lib/libdrm.a				-unknown-	xorg
 ./usr/X11R7/lib/libdrm_g.a				-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libdrm_p.a				-unknown-	profile,xorg
+./usr/X11R7/lib/libdrm_radeon.a				-unknown-	xorg
+./usr/X11R7/lib/libdrm_radeon_g.a			-unknown-	debuglib,xorg
+./usr/X11R7/lib/libdrm_radeon_p.a			-unknown-	profile,xorg
 ./usr/X11R7/lib/libexpat.a				-unknown-	xorg
 ./usr/X11R7/lib/libexpat_g.a				-unknown-	debuglib,xorg
 ./usr/X11R7/lib/libexpat_p.a				-unknown-	profile,xorg
diff --git a/distrib/sets/lists/xcomp/shl.mi b/distrib/sets/lists/xcomp/shl.mi
index fc86ed1e3da4..6bf3cb748cbe 100644
--- a/distrib/sets/lists/xcomp/shl.mi
+++ b/distrib/sets/lists/xcomp/shl.mi
@@ -1,4 +1,4 @@
-#	$NetBSD: shl.mi,v 1.21 2010/05/22 23:03:13 mrg Exp $
+#	$NetBSD: shl.mi,v 1.22 2010/05/22 23:19:45 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -90,6 +90,7 @@
 ./usr/X11R7/lib/libXxf86misc_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/libXxf86vm_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/libdrm_pic.a				-unknown-	xorg
+./usr/X11R7/lib/libdrm_radeon_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/libexpat_pic.a				-unknown-	xorg
 ./usr/X11R7/lib/libfontconfig_pic.a			-unknown-	xorg
 ./usr/X11R7/lib/libfontenc_pic.a			-unknown-	xorg
diff --git a/etc/mtree/NetBSD.dist.Xorg b/etc/mtree/NetBSD.dist.Xorg
index 287d7352d9e9..a7351ed8314b 100644
--- a/etc/mtree/NetBSD.dist.Xorg
+++ b/etc/mtree/NetBSD.dist.Xorg
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist.Xorg,v 1.6 2010/05/22 23:03:13 mrg Exp $
+#	$NetBSD: NetBSD.dist.Xorg,v 1.7 2010/05/22 23:19:45 mrg Exp $
 
 ./usr/X11R7
 ./usr/X11R7/bin
@@ -21,6 +21,7 @@
 ./usr/X11R7/include/X11/fonts
 ./usr/X11R7/include/X11/pixmaps
 ./usr/X11R7/include/libdrm
+./usr/X11R7/include/libkms
 ./usr/X11R7/include/fontconfig
 ./usr/X11R7/include/freetype2
 ./usr/X11R7/include/freetype2/freetype