diff --git a/TODO b/TODO
index 0ba103872..d2009d0c1 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,11 @@
 These are the TODO items for the next LFS release (3.0):
 
+* Add dedicated package version number entities (to avoid having to make
+  changes to 2-7 files to just change the version number of a package).
+
+* Get rid of the codes 'pp' in chapter 5 entities, 'in' in chapter 6
+  entities and the like with other chapters.
+
 * Re-arrange the list in chapter 3 to match the order in which 
   packages are installed.