diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 87c101ddee60..48c972774990 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.813 2009/06/10 00:40:33 agc Exp $
+# $NetBSD: mi,v 1.814 2009/06/10 02:20:13 mrg Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -649,6 +649,7 @@
 ./usr/X11R7/share				base-x11-root
 ./usr/X11R7/share/examples			base-x11-root
 ./usr/X11R7/share/examples/ssh-askpass		base-x11-root
+./usr/X11R7/share/pciids			base-x11-root
 ./usr/bin					base-sys-usr
 ./usr/bin/Mail					base-mail-bin
 ./usr/bin/apply					base-util-bin
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 1b135f8a80db..3e31206178f1 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -1,4 +1,5 @@
-# $NetBSD: md.amd64,v 1.3 2009/06/09 04:39:50 mrg Exp $
+# $NetBSD: md.amd64,v 1.4 2009/06/10 02:20:13 mrg Exp $
+./usr/X11R7/share/pciids/pci.ids		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 7cccd5ca8fa4..04d28b7a9850 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -1,4 +1,5 @@
-# $NetBSD: md.i386,v 1.19 2009/06/09 04:39:50 mrg Exp $
+# $NetBSD: md.i386,v 1.20 2009/06/10 02:20:13 mrg Exp $
+./usr/X11R7/share/pciids/pci.ids		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so			-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0		-unknown-		xorg
 ./usr/X11R7/lib/libdrm_intel.so.0.0		-unknown-		xorg
diff --git a/etc/mtree/NetBSD.dist b/etc/mtree/NetBSD.dist
index e57ec073aa99..23de0fb2b8d9 100644
--- a/etc/mtree/NetBSD.dist
+++ b/etc/mtree/NetBSD.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist,v 1.403 2009/06/03 18:47:06 bouyer Exp $
+#	$NetBSD: NetBSD.dist,v 1.404 2009/06/10 02:20:13 mrg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -415,6 +415,7 @@
 ./usr/X11R7/share
 ./usr/X11R7/share/examples
 ./usr/X11R7/share/examples/ssh-askpass
+./usr/X11R7/share/pciids
 ./usr/bin
 ./usr/games
 ./usr/games/hide		gname=games mode=0750
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
index 7e54ae4cd4f6..cd3bb8b106d4 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/pcidata/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/08/24 13:47:05 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2009/06/10 02:20:13 mrg Exp $
 
 # XXX this one is installed in modular-xorg-server
 
@@ -29,6 +29,11 @@ CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/hw/xfree86/common \
 		-I${X11SRCDIR.xorg-server}/rac \
 		-I.
 
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+FILES=		pci.ids
+FILESDIR=	${X11ROOTDIR}/share/pciids
+.endif
+
 .include <bsd.x11.mk>
 LIBDIR=	${XMODULEDIR}
 .include <bsd.lib.mk>