diff --git a/distrib/sets/lists/xserver/md.mac68k b/distrib/sets/lists/xserver/md.mac68k
index a7cfc1a44e1f..45e4b333a88a 100644
--- a/distrib/sets/lists/xserver/md.mac68k
+++ b/distrib/sets/lists/xserver/md.mac68k
@@ -1,6 +1,107 @@
-# $NetBSD: md.mac68k,v 1.14 2009/02/09 16:28:54 abs Exp $
-./usr/X11R6/bin/X -unknown- x11
-./usr/X11R6/bin/Xmac68k -unknown- x11
-./usr/X11R6/man/cat1/Xmac68k.0 -unknown- .cat,x11
-./usr/X11R6/man/html1/Xmac68k.html -unknown- html,x11
-./usr/X11R6/man/man1/Xmac68k.1 -unknown- .man,x11
+# $NetBSD: md.mac68k,v 1.15 2015/09/30 22:58:02 rjs Exp $
+./usr/X11R6/bin/X -unknown- x11,obsolete
+./usr/X11R6/bin/Xmac68k -unknown- x11,obsolete
+./usr/X11R6/man/cat1/Xmac68k.0 -unknown- .cat,x11,obsolete
+./usr/X11R6/man/html1/Xmac68k.html -unknown- html,x11,obsolete
+./usr/X11R6/man/man1/Xmac68k.1 -unknown- .man,x11,obsolete
+./usr/X11R7/bin/X -unknown- xorg
+./usr/X11R7/bin/Xorg -unknown- xorg
+./usr/X11R7/bin/cvt -unknown- xorg
+./usr/X11R7/bin/gtf -unknown- xorg
+./usr/X11R7/lib/X11/doc/README.modes -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/mouse_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/librecord_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.so -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libexa.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libexa.so -unknown- xorg
+./usr/X11R7/lib/modules/libexa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libexa_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libfb.a -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libfb_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libi2c.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so.0 -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libshadowfb.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb.so -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvbe.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libvbe.so -unknown- xorg
+./usr/X11R7/lib/modules/libvbe.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvbe_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvgahw.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw.so -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libvgahw_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxaa.a -unknown- xorg,obsolete
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/libxaa_pic.a -unknown- xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.a -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp.so.0 -unknown- obsolete
+./usr/X11R7/lib/modules/libxf8_16bpp_pic.a -unknown- obsolete
+./usr/X11R7/man/cat1/Xorg.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
+./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/mousedrv.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
+./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
+./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
+./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/mousedrv.html -unknown- html,xorg
+./usr/X11R7/man/html4/ws.html -unknown- html,xorg
+./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
+./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
+./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
+./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
+./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/mousedrv.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
+./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
+./usr/X11R7/share/aclocal/xorg-server.m4 -unknown- xorg
diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile
index 047aac9e2ac4..5dda4e346f38 100644
--- a/external/mit/xorg/server/drivers/Makefile
+++ b/external/mit/xorg/server/drivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2015/07/22 16:37:33 mrg Exp $
+# $NetBSD: Makefile,v 1.69 2015/09/30 22:58:02 rjs Exp $
# xf86-input drivers
@@ -182,6 +182,11 @@ SUBDIR+= \
xf86-video-wsfb
.endif # ${MACHINE} == "luna68k"
+.if ${MACHINE} == "mac68k"
+SUBDIR+= \
+ xf86-video-wsfb
+.endif # ${MACHINE} == "mac68k"
+
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
diff --git a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
index a2d54a4ff0ec..4e0b055eab24 100644
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2015/07/23 08:03:25 mrg Exp $
+# $NetBSD: Makefile,v 1.38 2015/09/30 22:58:02 rjs Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -90,7 +90,8 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
.endif
.if ${MACHINE} == "hp300" || \
- ${MACHINE} == "luna68k"
+ ${MACHINE} == "luna68k" || \
+ ${MACHINE} == "mac68k"
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index d170394e24fd..e5355701b847 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.873 2015/09/25 08:24:20 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.874 2015/09/30 22:58:02 rjs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1049,6 +1049,7 @@ ${var}?= ${${var}.${MACHINE_ARCH}:Uno}
${MACHINE} == "hpcsh" || \
${MACHINE} == "i386" || \
${MACHINE} == "luna68k" || \
+ ${MACHINE} == "mac68k" || \
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "newsmips" || \