diff --git a/external/mit/xorg/bin/xfs/Makefile b/external/mit/xorg/bin/xfs/Makefile
index 14e54ff4fba1..8fa7c9959942 100644
--- a/external/mit/xorg/bin/xfs/Makefile
+++ b/external/mit/xorg/bin/xfs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.12 2015/07/17 17:57:11 mrg Exp $
+#	$NetBSD: Makefile,v 1.13 2018/03/03 03:34:17 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -59,8 +59,8 @@ FILESNAME=	config
 FILESDIR=	${XFSCONFIGDIR}
 
 
-LDADD+=	-lXfont -lfontenc -lXfontcache -lXext -lX11 -lfreetype -lm -lz
-DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXFONTCACHE} ${LIBXEXT} ${LIBX11} \
+LDADD+=	-lXfont -lfontenc -lXext -lX11 -lfreetype -lm -lz
+DPADD+=	${LIBXFONT} ${LIBFONTENC} ${LIBXEXT} ${LIBX11} \
 	${LIBFREETYPE} ${LIBM} ${LIBZ}
 
 .PATH:	${XFSDIR}
diff --git a/external/mit/xorg/bin/xset/Makefile b/external/mit/xorg/bin/xset/Makefile
index b4d4b3ca7090..6750fdf169fe 100644
--- a/external/mit/xorg/bin/xset/Makefile
+++ b/external/mit/xorg/bin/xset/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/04/16 20:52:07 nakayama Exp $
+#	$NetBSD: Makefile,v 1.6 2018/03/03 03:34:17 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,8 @@ PROG=	xset
 
 CPPFLAGS+=${X11FLAGS.EXTENSION} -DXKB
 
-LDADD+=	-lXmuu -lXt -lSM -lICE -lXxf86misc -lXfontcache -lXext -lX11
-DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC} ${LIBXFONTCACHE}
+LDADD+=	-lXmuu -lXt -lSM -lICE -lXxf86misc -lXext -lX11
+DPADD+= ${LIBXMUU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXXF86MISC}
 DPADD+=	${LIBXEXT} ${LIBX11}
 
 .PATH:	${X11SRCDIR.${PROG}}