diff --git a/share/mk/bsd.hostlib.mk b/share/mk/bsd.hostlib.mk
index 282cf80c8737..813d40837dff 100644
--- a/share/mk/bsd.hostlib.mk
+++ b/share/mk/bsd.hostlib.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostlib.mk,v 1.4 2003/06/11 04:56:58 msaitoh Exp $
+#	$NetBSD: bsd.hostlib.mk,v 1.5 2003/07/28 23:54:24 lukem Exp $
 
 .include <bsd.init.mk>
 .include <bsd.sys.mk>
@@ -20,7 +20,7 @@ OBJHOSTMACHINE=	# set
 
 ##### Build rules
 .if defined(HOSTLIB)
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 .endif	# defined(HOSTLIB)
 
diff --git a/share/mk/bsd.hostprog.mk b/share/mk/bsd.hostprog.mk
index 26d42b335d9d..cff924fd887e 100644
--- a/share/mk/bsd.hostprog.mk
+++ b/share/mk/bsd.hostprog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.30 2003/07/18 04:04:03 lukem Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.31 2003/07/28 23:54:24 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include <bsd.init.mk>
@@ -62,7 +62,7 @@ OBJHOSTMACHINE=	# set
 .if defined(HOSTPROG)
 SRCS?=		${HOSTPROG}.c
 
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
 .if !empty(SRCS:N*.h:N*.sh)
diff --git a/share/mk/bsd.lib.mk b/share/mk/bsd.lib.mk
index 52d68c3373a3..89016a65cfce 100644
--- a/share/mk/bsd.lib.mk
+++ b/share/mk/bsd.lib.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.lib.mk,v 1.228 2003/07/28 04:08:47 lukem Exp $
+#	$NetBSD: bsd.lib.mk,v 1.229 2003/07/28 23:54:24 lukem Exp $
 #	@(#)bsd.lib.mk	8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -362,7 +362,7 @@ __archiveinstall: .USE
 __archivesymlinkpic: .USE
 	${INSTALL_SYMLINK} ${SYSPKGTAG} ${.ALLSRC} ${.TARGET}
 
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
 lib${LIB}.a:: ${OBJS} __archivebuild
diff --git a/share/mk/bsd.prog.mk b/share/mk/bsd.prog.mk
index 3f377158709e..185b5712a120 100644
--- a/share/mk/bsd.prog.mk
+++ b/share/mk/bsd.prog.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.prog.mk,v 1.177 2003/07/28 08:53:55 lukem Exp $
+#	$NetBSD: bsd.prog.mk,v 1.178 2003/07/28 23:54:25 lukem Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .ifndef HOSTPROG
@@ -89,7 +89,7 @@ SRCS?=		${PROG}.cc
 SRCS?=		${PROG}.c
 .endif
 
-DPSRCS+=	${SRCS:M*.[ly]:C/\..$/.c/}
+DPSRCS+=	${SRCS:M*.l:.l=.c} ${SRCS:M*.y:.y=.c}
 CLEANFILES+=	${DPSRCS} ${YHEADER:D${SRCS:M*.y:.y=.h}}
 
 .if !empty(SRCS:N*.h:N*.sh:N*.fth)