diff --git a/lib/hx509/ChangeLog b/lib/hx509/ChangeLog
index d300bbbcb..32f8d8d56 100644
--- a/lib/hx509/ChangeLog
+++ b/lib/hx509/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-15  Love Hörnquist Åstrand  <lha@it.su.se>
+
+	* sel.h: rename yyerror to sel_yyerror in the whole library, not
+	just the lexer
+
+	* sel-lex.l: rename yyerror to sel_yyerror in the whole library,
+	not just the lexer
+
 2008-04-08  Love Hörnquist Åstrand  <lha@it.su.se>
 
 	* hx509.h: Make self-standing by including missing files.
diff --git a/lib/hx509/sel-lex.l b/lib/hx509/sel-lex.l
index dc3999c09..94989761a 100644
--- a/lib/hx509/sel-lex.l
+++ b/lib/hx509/sel-lex.l
@@ -51,8 +51,6 @@ static void sel_yyerror (char *);
 
 struct hx_expr_input _hx509_expr_input;
 
-#define yyerror(msg)  sel_yyerror(msg )
-
 #define YY_NO_UNPUT 1
 
 #undef YY_INPUT
diff --git a/lib/hx509/sel.h b/lib/hx509/sel.h
index 782d266fa..40c5f6406 100644
--- a/lib/hx509/sel.h
+++ b/lib/hx509/sel.h
@@ -68,3 +68,5 @@ struct hx_expr_input {
 extern struct hx_expr_input _hx509_expr_input;
 
 int yyparse(void);
+
+#define yyerror(msg)  sel_yyerror(msg )