diff --git a/external/mit/xorg/bin/bdftruncate/Makefile b/external/mit/xorg/bin/bdftruncate/Makefile
index b791569dcb13..8cf3f00f0d61 100644
--- a/external/mit/xorg/bin/bdftruncate/Makefile
+++ b/external/mit/xorg/bin/bdftruncate/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.2 2009/08/22 01:02:47 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2010/11/21 01:25:32 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=	bdftruncate
 
-.PATH:	${X11SRCDIR.font-util}
+.PATH:	${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/ucs2any/Makefile b/external/mit/xorg/bin/ucs2any/Makefile
index aa01395dbdc0..d774e4c088b1 100644
--- a/external/mit/xorg/bin/ucs2any/Makefile
+++ b/external/mit/xorg/bin/ucs2any/Makefile
@@ -1,10 +1,10 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2010/11/21 01:25:32 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=	ucs2any
 
-.PATH:	${X11SRCDIR.font-util}
+.PATH:	${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xconsole/Makefile b/external/mit/xorg/bin/xconsole/Makefile
index 8b29908e5df5..664962f8f913 100644
--- a/external/mit/xorg/bin/xconsole/Makefile
+++ b/external/mit/xorg/bin/xconsole/Makefile
@@ -1,16 +1,16 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2010/11/21 01:25:32 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=	xconsole
 
-APPDEFS=XConsole.ad
+APPDEFS=XConsole
 
 LDADD+=	-lutil -lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBUTIL} ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 	${LIBXPM} ${LIBXEXT} ${LIBX11}
 
-.PATH:	${X11SRCDIR.${PROG}}
+.PATH:	${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xedit/xedit/Makefile b/external/mit/xorg/bin/xedit/xedit/Makefile
index 3bd5c9d5bf71..e5f9bb898bac 100644
--- a/external/mit/xorg/bin/xedit/xedit/Makefile
+++ b/external/mit/xorg/bin/xedit/xedit/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2009/03/10 03:55:59 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2010/11/21 01:25:32 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -8,9 +8,7 @@ SRCS=		xedit.c commands.c util.c ispell.c options.c hook.c lisp.c \
 
 CPPFLAGS+=	-I${X11SRCDIR.xedit}/lisp/re
 
-APPDEFS=	Xedit.ad Xedit-color.ad
-
-BUILDSYMLINKS=	Xedit-xprint.ad Xedit.ad
+APPDEFS=	Xedit Xedit-color
 
 .for _L in lisp mp re
 LIB.${_L}!=	cd ${.CURDIR}/../${_L} && ${PRINTOBJDIR}
diff --git a/external/mit/xorg/bin/xfd/Makefile b/external/mit/xorg/bin/xfd/Makefile
index 2c08e00db9f9..ce35dd142608 100644
--- a/external/mit/xorg/bin/xfd/Makefile
+++ b/external/mit/xorg/bin/xfd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -7,7 +7,7 @@ SRCS=	xfd.c grid.c
 
 CPPFLAGS+=	-DXRENDER -DXFREE86_FT2 -I${DESTDIR}${X11INCDIR}/freetype2
 
-APPDEFS=Xfd.ad
+APPDEFS=Xfd
 
 LDADD+=	-lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=	${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}
@@ -15,7 +15,7 @@ LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11 -lm
 DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 	${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBM}
 
-.PATH:	${X11SRCDIR.${PROG}}
+.PATH:	${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xfontsel/Makefile b/external/mit/xorg/bin/xfontsel/Makefile
index e4dd9266eb0b..4fc29d1f0cc7 100644
--- a/external/mit/xorg/bin/xfontsel/Makefile
+++ b/external/mit/xorg/bin/xfontsel/Makefile
@@ -1,17 +1,17 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2008/07/29 05:01:22 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2010/11/21 01:25:33 mrg Exp $
 
 .include <bsd.own.mk>
 
 PROG=	xfontsel
 SRCS=	xfontsel.c ULabel.c
 
-APPDEFS=XFontSel.ad
+APPDEFS=XFontSel
 
 LDADD+=	-lXaw -lXmu -lXt -lSM -lICE -lXpm -lXext -lX11
 DPADD+=	${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} \
 	${LIBXPM} ${LIBXEXT} ${LIBX11}
 
-.PATH:	${X11SRCDIR.${PROG}}
+.PATH:	${X11SRCDIR.${PROG}} ${X11SRCDIR.${PROG}}/app-defaults
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff --git a/external/mit/xorg/bin/xfs/Makefile b/external/mit/xorg/bin/xfs/Makefile
index 4dcfd0388937..adb6eb98efaf 100644
--- a/external/mit/xorg/bin/xfs/Makefile
+++ b/external/mit/xorg/bin/xfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2010/05/24 05:30:40 veego Exp $
+#	$NetBSD: Makefile,v 1.7 2010/11/21 01:25:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,6 +6,8 @@ PROG=	xfs
 
 XFSDIR= ${X11SRCDIR.${PROG}}
 
+.PATH:	${XFSDIR}/man
+
 .PATH:	${XFSDIR}/difs
 SRCS=	atom.c cache.c charinfo.c difsutils.c dispatch.c events.c \
 	extensions.c fontinfo.c fonts.c globals.c initfonts.c main.c \
@@ -45,6 +47,7 @@ X11EXTRAMANDEFS+=	-e 's%__configfilepath__%${XFSCONFIGDIR}/config%g; \
 			s%__configfiledesc__%the default file,%g'
 
 
+.PATH:	${XFSDIR}/config
 BUILDSYMLINKS=	config.cpp fsconfig.cpp
 CPPSCRIPTS=	fsconfig
 CPPSCRIPTFLAGS=	-DDEFAULTFONTPATH=${X11FONTDIR}/misc/,${X11FONTDIR}/Type1/,${X11FONTDIR}/75dpi/,${X11FONTDIR}/100dpi/ \
diff --git a/external/mit/xorg/share/fonts/font-util/Makefile b/external/mit/xorg/share/fonts/font-util/Makefile
index 0e3fed6c4a0f..1933fddb2a41 100644
--- a/external/mit/xorg/share/fonts/font-util/Makefile
+++ b/external/mit/xorg/share/fonts/font-util/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2008/09/13 04:32:31 cube Exp $
+#	$NetBSD: Makefile,v 1.3 2010/11/21 01:25:33 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -17,4 +17,4 @@ PKGDIST=	font-util
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
 
-.PATH:  ${X11SRCDIR.font-util}
+.PATH:  ${X11SRCDIR.font-util} ${X11SRCDIR.font-util}/man