diff --git a/usr.sbin/wsmoused/Makefile b/usr.sbin/wsmoused/Makefile
index 60c23c5a27e8..a27a85a3d203 100644
--- a/usr.sbin/wsmoused/Makefile
+++ b/usr.sbin/wsmoused/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/04/22 15:23:10 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/29 14:40:09 christos Exp $
 #
 
 WARNS?= 2	# XXX -Wcast-qual (etc)
@@ -21,7 +21,7 @@ CPPFLAGS+=	-DWSMOUSED_SELECTION_MODE
 SRCS+=		selection.c
 .endif
 
-CPPFLAGS+=	-I${.CURDIR} -I. -DYY_NO_INPUT
+CPPFLAGS+=	-I${.CURDIR} -I.
 LDADD+=		-lutil
 
 YHEADER=	yes
diff --git a/usr.sbin/wsmoused/config_lex.l b/usr.sbin/wsmoused/config_lex.l
index 18e00b089426..661f89acd466 100644
--- a/usr.sbin/wsmoused/config_lex.l
+++ b/usr.sbin/wsmoused/config_lex.l
@@ -1,4 +1,4 @@
-/* $NetBSD: config_lex.l,v 1.6 2009/10/28 22:49:38 christos Exp $ */
+/* $NetBSD: config_lex.l,v 1.7 2009/10/29 14:40:09 christos Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
 #include <sys/cdefs.h>
 
 #ifndef lint
-__RCSID("$NetBSD: config_lex.l,v 1.6 2009/10/28 22:49:38 christos Exp $");
+__RCSID("$NetBSD: config_lex.l,v 1.7 2009/10/29 14:40:09 christos Exp $");
 #endif /* not lint */
 
 #include <stdio.h>
@@ -50,11 +50,10 @@ extern int yyline;
 extern int yyerror(const char *fmt, ...);
 int yylex(void);
 
-#define YY_NO_UNPUT
 
 %}
 
-%option noyywrap
+%option noyywrap noinput nounput
 
 STRING		[\$A-Za-z\.\/_\-0-9]*
 SP_STRING	[\$A-Za-z\.\/_\-0-9 ]*