diff --git a/doc/TODO b/doc/TODO
index f0e408151c..f75e14cfeb 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,6 +4,8 @@ xbps-src:
    Something like ${sourceforge} to pick up any specified mirror on the list.
  * Add support to run INSTALL/REMOVE scripts, so that the same actions are
    performed in source/bin packages. [STOPPED]
+ * Modify the genindex target to add a single package, without having
+   to create it from scratch.
 
 Packages:
  * fix mpfr hardcoded rpath for gmp.
@@ -12,7 +14,9 @@ Packages:
  * Create /etc/issue.
  * Create files in /etc/skel for new users.
  * Add a trigger for fc-cache.
- * Add a trigger to (un)register users/groups.
+ * Add a trigger to (un)register users/groups. Currently packages that
+   require user/groups use custom INSTALL/REMOVE scripts, which adds
+   a lot of duplicated work.
  
 xbps-bin:
  * Add support to handle conf_files and keep_dirs from package metadata.