diff --git a/lib/libpcap/Makefile b/lib/libpcap/Makefile
index 972f3162c4f2..50a2429b9d3b 100644
--- a/lib/libpcap/Makefile
+++ b/lib/libpcap/Makefile
@@ -9,7 +9,7 @@ SRCS=	\
         bpf_filter.c bpf_image.c \
         grammar.y scanner.l
 
-CLEANFILES+= scanner.c tokdefs.h grammar.c scanner.c
+CLEANFILES+= lex.yy.c tokdefs.h grammar.c scanner.c
 # CFLAGS+=-Wall -I. -I${.CURDIR} -DFDDI -Dyylval=pcap_lval
 CFLAGS+=-DFDDI -I. -I${.CURDIR}
 MAN3=	pcap.3
@@ -25,7 +25,7 @@ beforeinstall:
 scanner.o: tokdefs.h
 
 tokdefs.h: grammar.c
-	mv -f grammar.tab.h tokdefs.h
+	mv -f y.tab.h tokdefs.h
 
 
 .include <bsd.lib.mk>
diff --git a/libexec/ftpd/Makefile b/libexec/ftpd/Makefile
index 9bee7c2ac73d..a3065e72793f 100644
--- a/libexec/ftpd/Makefile
+++ b/libexec/ftpd/Makefile
@@ -2,13 +2,13 @@
 
 PROG=	ftpd
 MAN8=	ftpd.8
-SRCS=	ftpd.c ftpcmd.y logwtmp.c popen.c skey-stuff.c
+SRCS=	ftpd.c ftpcmd.c logwtmp.c popen.c skey-stuff.c
 
 CFLAGS+=-DSETPROCTITLE -DSKEY -DSTATS
 
 LDADD=	-lskey -lmd -lcrypt -lutil
 DPADD=	${LIBSKEY} ${LIBMD} ${LIBCRYPT} ${LIBUTIL}
 
-CLEANFILES+=ftpcmd.tab.h
+CLEANFILES+=ftpcmd.c y.tab.h
 
 .include <bsd.prog.mk>