diff --git a/x11/Xserver/hw/xfree86/etc/Makefile b/x11/Xserver/hw/xfree86/etc/Makefile
index cce2ab4d9720..b6fddccc085c 100644
--- a/x11/Xserver/hw/xfree86/etc/Makefile
+++ b/x11/Xserver/hw/xfree86/etc/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.1 2004/01/06 14:16:19 rtr Exp $
+#	$NetBSD: Makefile,v 1.2 2004/01/19 00:30:01 lukem Exp $
 
 .include <bsd.own.mk>
 
 .PATH:	${X11SRCDIR.xc}/programs/Xserver/hw/xfree86/etc
 
-FILES=			sun.tcap sun.tinfo xmodmap.std
-FILESNAME_sun.tcap=	sun.termcap
-FILESNAME_sun.tinfo=	sun.terminfo
+FILES=			xmodmap.std
 FILESDIR=		${X11USRLIBDIR}/X11/etc
 
 .include <bsd.x11.mk>
diff --git a/x11/bin/xdm/Makefile b/x11/bin/xdm/Makefile
index 445e783309ca..75079d969a58 100644
--- a/x11/bin/xdm/Makefile
+++ b/x11/bin/xdm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2004/01/02 17:19:51 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/01/19 00:30:01 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -26,11 +26,6 @@ CPPFLAGS.resource.c=	\
 	-DDEF_AUTH_DIR=\"${X11LIBDIR}/xdm\" \
 	-DDEF_GREETER_LIB=\"${X11LIBDIR}/xdm/libXdmGreet.so\"
 
-#FILESDIR=${X11LIBDIR}/etc
-#FILES=	xterm.termcap xterm.terminfo
-#
-#realall: ${FILES}
-
 LDADD+=		-lXau -lXdmcp -lXinerama -lXpm -lXmu
 LDADD+=		-lXt -lSM -lICE -lXext -lX11 -lcrypt
 DPADD+=		${LIBXAU} ${LIBXDMCP} ${LIBXINERAMA} ${LIBXPM} ${LIBXMU}
diff --git a/x11/bin/xterm/Makefile b/x11/bin/xterm/Makefile
index 8894d3a2abfa..575a85e83485 100644
--- a/x11/bin/xterm/Makefile
+++ b/x11/bin/xterm/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.4 2003/09/30 06:41:30 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/01/19 00:30:01 lukem Exp $
 
 .include <bsd.own.mk>
 
@@ -20,12 +20,7 @@ CPPFLAGS.main.c=-DUTMP -DUSE_TTY_GROUP ${X11FLAGS.VERSION}
 
 APPDEFS=XTerm.ad XTerm-color.ad
 
-BUILDSYMLINKS=	XTerm-col.ad XTerm-color.ad \
-		termcap xterm.termcap \
-		terminfo xterm.terminfo
-
-FILESDIR=${X11LIBDIR}/etc
-FILES=	xterm.termcap xterm.terminfo
+BUILDSYMLINKS=	XTerm-col.ad XTerm-color.ad
 
 LDADD+=	-lXft -lfontconfig -lfreetype -lexpat -lXrender
 DPADD+=	${LIBXFT} ${LIBFONTCONFIG} ${LIBFREETYPE} ${LIBEXPAT} ${LIBXRENDER}