diff --git a/ChangeLog b/ChangeLog
index 7ce96d14..293cb7c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-11  Akim Demaille  <demaille@gostai.com>
+
+	Factor the tables.
+	* TODO: New item.
+
 2008-11-11  Akim Demaille  <demaille@gostai.com>
 
 	Let yytranslate handle the eof case.
diff --git a/TODO b/TODO
index 918ca350..634082ab 100644
--- a/TODO
+++ b/TODO
@@ -71,6 +71,12 @@ really possible?  The test suite does not exercise this case.
 This shows that it would be interesting to manage to install skeleton
 coverage analysis to the test suite.
 
+** Table definitions
+It should be very easy to factor the definition of the various tables,
+including the separation bw declaration and definition.  See for
+instance b4_table_define in lalr1.cc.  This way, we could even factor
+C vs. C++ definitions.
+
 * Header guards
 
 From Franc,ois: should we keep the directory part in the CPP guard?