diff --git a/usr.bin/fgen/Makefile b/usr.bin/fgen/Makefile
index 0f513a96a124..70577ba93ad2 100644
--- a/usr.bin/fgen/Makefile
+++ b/usr.bin/fgen/Makefile
@@ -1,6 +1,6 @@
-#	$NetBSD: Makefile,v 1.7 2009/04/20 16:05:30 drochner Exp $
+#	$NetBSD: Makefile,v 1.8 2009/10/29 14:35:25 christos Exp $
 
-CPPFLAGS+= -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+= -I${.CURDIR}
 PROG=	fgen
 SRCS=	fgen.l
 MAN=	fgen.1
diff --git a/usr.bin/fgen/fgen.l b/usr.bin/fgen/fgen.l
index ce0f6e0952e3..3727ffeff2f6 100644
--- a/usr.bin/fgen/fgen.l
+++ b/usr.bin/fgen/fgen.l
@@ -1,5 +1,5 @@
 %{
-/*	$NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $	*/
+/*	$NetBSD: fgen.l,v 1.32 2009/10/29 14:35:25 christos Exp $	*/
 /* FLEX input for FORTH input file scanner */
 /*  
  * Copyright (c) 1998 Eduardo Horvath.
@@ -42,12 +42,12 @@
 #endif
 
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: fgen.l,v 1.31 2009/10/19 18:12:37 snj Exp $");
+__RCSID("$NetBSD: fgen.l,v 1.32 2009/10/29 14:35:25 christos Exp $");
 #endif
 
 %}
 
-%option yylineno
+%option yylineno noinput
 
 decimal	[0-9.]
 hex	[0-9A-Fa-f.]
diff --git a/usr.bin/menuc/Makefile b/usr.bin/menuc/Makefile
index fbb6561fb760..c44a97b0764d 100644
--- a/usr.bin/menuc/Makefile
+++ b/usr.bin/menuc/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.13 2009/04/20 16:05:30 drochner Exp $
+#	$NetBSD: Makefile,v 1.14 2009/10/29 14:36:14 christos Exp $
 
 WARNS?= 1	# XXX -Wshadow -Wcast-qual issues
 
@@ -6,7 +6,7 @@ WARNS?= 1	# XXX -Wshadow -Wcast-qual issues
 
 PROG=		menuc
 SRCS=		main.c parse.y scan.l avl.c mdb.c util.c
-CPPFLAGS+=	-I. -I${.CURDIR} -DYY_NO_INPUT
+CPPFLAGS+=	-I. -I${.CURDIR}
 YHEADER=
 
 .if ${MKSHARE} != "no"
diff --git a/usr.bin/menuc/scan.l b/usr.bin/menuc/scan.l
index f0bb8b943245..db2aecae3fcd 100644
--- a/usr.bin/menuc/scan.l
+++ b/usr.bin/menuc/scan.l
@@ -1,4 +1,4 @@
-/*	$NetBSD: scan.l,v 1.14 2004/08/02 21:29:07 dsl Exp $	*/
+/*	$NetBSD: scan.l,v 1.15 2009/10/29 14:36:14 christos Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -52,6 +52,8 @@ static int comstart;	/* line number of comment start. */
 %x COMMENT
 %x BRACE
 
+%option noinput
+
 %%
 
 [ \t]+	{ /* ignore spaces and tabs */ }