diff --git a/x11/lib/Xt/Makefile b/x11/lib/Xt/Makefile
index 2edbe98ad320..399d04796cfa 100644
--- a/x11/lib/Xt/Makefile
+++ b/x11/lib/Xt/Makefile
@@ -1,12 +1,10 @@
-#	$NetBSD: Makefile,v 1.4 2003/11/08 13:57:29 lukem Exp $
+#	$NetBSD: Makefile,v 1.5 2004/02/07 04:02:01 rtr Exp $
 
 .include <bsd.own.mk>
 
 LIB=	Xt
 .PATH:	${X11SRCDIR.xc}/lib/${LIB}
 
-SUBDIR=	makestrs
-
 SRCS=	ActionHook.c Alloc.c ArgList.c Callback.c ClickTime.c \
 	Composite.c Constraint.c Convert.c Converters.c Core.c \
 	Create.c Destroy.c Display.c Error.c Event.c EventUtil.c \
@@ -34,7 +32,7 @@ CPPFLAGS.TMkey.c=	-DXKB
 LDADD+=	-lX11 -lSM -lICE
 DPADD+=	${LIBX11} ${LIBSM} ${LIBICE}
 
-MAKESTRSDIR!=	cd ${.CURDIR}/makestrs && ${PRINTOBJDIR}
+MAKESTRSDIR!=	cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${PRINTOBJDIR}
 MAKESTRS=	${MAKESTRSDIR}/makestrs
 
 ${MAKESTRS}:
@@ -54,4 +52,3 @@ DPSRCS+=	${STRINGS_FILES}
 
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
-.include <bsd.subdir.mk>
diff --git a/x11/tools/Makefile b/x11/tools/Makefile
index 54c34f59cacd..c266dfb2e828 100644
--- a/x11/tools/Makefile
+++ b/x11/tools/Makefile
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2003/12/20 12:55:01 rtr Exp $
+#	$NetBSD: Makefile,v 1.4 2004/02/07 04:02:01 rtr Exp $
 
 SUBDIR=	pswrap
 SUBDIR+=bdftopcf fc-cache mkfontdir ucs2any mkg3states
-SUBDIR+=makekeys .WAIT xkbcomp
+SUBDIR+=makekeys makestrs .WAIT xkbcomp
 
 .include <bsd.subdir.mk>
diff --git a/x11/lib/Xt/makestrs/Makefile b/x11/tools/makestrs/Makefile
similarity index 73%
rename from x11/lib/Xt/makestrs/Makefile
rename to x11/tools/makestrs/Makefile
index 60b7b9562dc3..bfa7d9985e90 100644
--- a/x11/lib/Xt/makestrs/Makefile
+++ b/x11/tools/makestrs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2003/09/30 06:41:31 lukem Exp $
+#	$NetBSD: Makefile,v 1.1 2004/02/07 04:02:01 rtr Exp $
 
 NOMAN=	1