diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 4a87080b8f..21ac1e5d7b 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2014-03-12  Dmitry Gorbachev  <d.g.gorbachev@gmail.com>
+
+	PR binutils/16567
+	* deflex.l: Add noinput and nounput options.
+
 2014-03-12  Alan Modra  <amodra@gmail.com>
 
 	* Makefile.in: Regenerate.
diff --git a/binutils/deflex.l b/binutils/deflex.l
index a5e344883b..0a9a0d94ab 100644
--- a/binutils/deflex.l
+++ b/binutils/deflex.l
@@ -1,3 +1,5 @@
+%option noinput nounput
+
 %{/* deflex.l - Lexer for .def files */
 
 /* Copyright (C) 1995-2014 Free Software Foundation, Inc.
@@ -27,8 +29,6 @@
 #include "defparse.h"
 #include "dlltool.h"
 
-#define YY_NO_UNPUT
-
 int linenumber;
 
 %}