diff --git a/ChangeLog b/ChangeLog
index 374b1d37..c961b7b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-08-27  Akim Demaille  <demaille@gostai.com>
+
+	Support yyerrok in lalr1.cc.
+	YYBACKUP is still to import back into lalr1.cc.
+        * data/lalr1.cc (yyerrork, yyclearin, YYRECOVERING): Define.
+
 2008-08-26  Joel E. Denny  <jdenny@ces.clemson.edu>
 
 	For maintainer-check*, don't recompile for a $(VERSION) update.
diff --git a/data/lalr1.cc b/data/lalr1.cc
index 7ecc525b..bc371dcc 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -367,9 +367,13 @@ do {					\
 
 #endif /* !YYDEBUG */
 
+#define yyerrok		(yyerrstatus_ = 0)
+#define yyclearin	(yychar = yyempty_)
+
 #define YYACCEPT	goto yyacceptlab
 #define YYABORT		goto yyabortlab
 #define YYERROR		goto yyerrorlab
+#define YYRECOVERING()  (!!yyerrstatus_)
 
 ]b4_namespace_open[
 #if YYERROR_VERBOSE