diff --git a/distrib/sets/lists/xdebug/md.evbarm b/distrib/sets/lists/xdebug/md.evbarm
index 48d12244aecc..61bbeb189e6d 100644
--- a/distrib/sets/lists/xdebug/md.evbarm
+++ b/distrib/sets/lists/xdebug/md.evbarm
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.11 2015/10/30 22:29:23 skrll Exp $
+# $NetBSD: md.evbarm,v 1.12 2015/11/06 01:17:08 jmcneill Exp $
 ./usr/X11R7/lib/libdrm_nouveau_g.a			-unknown-	debuglib,xorg
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	debuglib,xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		-unknown-	debuglib,xorg,obsolete
@@ -25,6 +25,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/modesetting_drv.so.0.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	-unknown-	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	-unknown-	xorg,debug
diff --git a/distrib/sets/lists/xserver/md.evbarm b/distrib/sets/lists/xserver/md.evbarm
index cb2bee104701..0c0afd8213c0 100644
--- a/distrib/sets/lists/xserver/md.evbarm
+++ b/distrib/sets/lists/xserver/md.evbarm
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.10 2015/10/29 10:12:28 jmcneill Exp $
+# $NetBSD: md.evbarm,v 1.11 2015/11/06 01:17:08 jmcneill Exp $
 ./usr/X11R7/bin/X					-unknown-	xorg
 ./usr/X11R7/bin/Xorg					-unknown-	xorg
 ./usr/X11R7/bin/cvt					-unknown-	xorg
@@ -10,6 +10,8 @@
 ./usr/X11R7/lib/modules/dri/nouveau_dri.so.0		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so	-unknown-	xorg
+./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0	-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		-unknown-	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		-unknown-	obsolete
@@ -83,6 +85,7 @@
 ./usr/X11R7/man/cat1/gtf.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/modesetting.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/mousedrv.0				-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/void.0				-unknown-	obsolete
 ./usr/X11R7/man/cat4/ws.0				-unknown-	.cat,xorg
@@ -93,6 +96,7 @@
 ./usr/X11R7/man/html1/gtf.html				-unknown-	html,xorg
 ./usr/X11R7/man/html4/exa.html				-unknown-	html,xorg
 ./usr/X11R7/man/html4/kbd.html				-unknown-	html,xorg
+./usr/X11R7/man/html4/modesetting.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/mousedrv.html			-unknown-	html,xorg
 ./usr/X11R7/man/html4/void.html				-unknown-	obsolete
 ./usr/X11R7/man/html4/ws.html				-unknown-	html,xorg
@@ -103,6 +107,7 @@
 ./usr/X11R7/man/man1/gtf.1				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/exa.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				-unknown-	.man,xorg
+./usr/X11R7/man/man4/modesetting.4			-unknown-	.man,xorg
 ./usr/X11R7/man/man4/mousedrv.4				-unknown-	.man,xorg
 ./usr/X11R7/man/man4/void.4				-unknown-	obsolete
 ./usr/X11R7/man/man4/ws.4				-unknown-	.man,xorg
diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile
index b5a8b3d4818b..bbe9b71d03d8 100644
--- a/external/mit/xorg/server/drivers/Makefile
+++ b/external/mit/xorg/server/drivers/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.73 2015/11/04 17:06:23 phx Exp $
+#	$NetBSD: Makefile,v 1.74 2015/11/06 01:17:08 jmcneill Exp $
 
 # xf86-input drivers
 
@@ -156,6 +156,7 @@ SUBDIR+= \
 
 .if ${MACHINE} == "evbarm"
 SUBDIR+= \
+	xf86-video-modesetting \
 	xf86-video-wsfb
 .endif # ${MACHINE} == "evbarm"
 
diff --git a/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile b/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
new file mode 100644
index 000000000000..b48772d0708a
--- /dev/null
+++ b/external/mit/xorg/server/drivers/xf86-video-modesetting/Makefile
@@ -0,0 +1,12 @@
+#	$NetBSD: Makefile,v 1.1 2015/11/06 01:17:08 jmcneill Exp $
+
+DRIVER=		xf86-video-modesetting
+DRIVER_NAME=	modesetting_drv
+
+SRCS=		driver.c drmmode_display.c
+MAN=		modesetting.4
+
+CPPFLAGS+=	-I${DESTDIR}${X11INCDIR}/libdrm
+CPPFLAGS+=	-DRANDR_12_INTERFACE
+
+.include "../Makefile.xf86-driver"
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 14753dc00e62..a8e57f6ef88d 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.878 2015/11/04 17:06:23 phx Exp $
+#	$NetBSD: bsd.own.mk,v 1.879 2015/11/06 01:17:08 jmcneill Exp $
 
 # This needs to be before bsd.init.mk
 .if defined(BSD_MK_COMPAT_FILE)
@@ -1299,7 +1299,8 @@ X11SRCDIR.xf86-input-${_i}?=	${X11SRCDIRMIT}/xf86-input-${_i}/dist
 
 .for _v in \
 	ag10e apm ark ast ati ati-kms chips cirrus crime \
-	geode glint i128 i740 igs imstt intel intel-old mach64 mga \
+	geode glint i128 i740 igs imstt intel intel-old \
+	modesetting mach64 mga \
 	neomagic newport nouveau nsc nv nvxbox openchrome pnozz \
 	r128 radeonhd rendition \
 	s3 s3virge savage siliconmotion sis suncg14 \