diff --git a/ChangeLog b/ChangeLog
index efb71953..3d45d5d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-04-08  Akim Demaille  <akim@epita.fr>
+
+	* src/reduce.c (reduce_grammar): First reduce the nonterminals,
+	and then the grammar.
+
+	
 2002-04-08  Akim Demaille  <akim@epita.fr>
 
 	* src/system.h: No longer using strndup.
diff --git a/src/reduce.c b/src/reduce.c
index 25681750..565cd572 100644
--- a/src/reduce.c
+++ b/src/reduce.c
@@ -487,10 +487,13 @@ reduce_grammar (void)
     fatal (_("Start symbol %s does not derive any sentence"),
 	   quotearg_style (escape_quoting_style, symbols[start_symbol]->tag));
 
-  if (nuseless_productions > 0)
-    reduce_grammar_tables ();
+  /* First reduce the nonterminals, as they renumber themselves in the
+     whole grammar.  If you change the order, nonterms would be
+     renumbered only in the reduced grammar.  */
   if (nuseless_nonterminals > 0)
     nonterminals_reduce ();
+  if (nuseless_productions > 0)
+    reduce_grammar_tables ();
 
   if (trace_flag)
     {