diff --git a/doc/TODO b/doc/TODO
index fd0fc58..b540ec1 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -4,8 +4,6 @@
 This is a list of planned bug fixes, improvements and enhancements for
 NewsStats.
 
-Bug numbers refer to the Mantis issue tracker at <http://bugs.th-h.de/>.
-
 * General
   - Improve Documentation
     The documentation is rather sparse and could use some improvement.
@@ -18,7 +16,7 @@ Bug numbers refer to the Mantis issue tracker at <http://bugs.th-h.de/>.
     to /usr/local/news/etc or /etc/news and so on
 
 * Additional features
-  - Add hierarchy information (GroupInfo - Bugs #19 #20 #21 #22 #23 #24 #25 #26)
+  - Add hierarchy information (GroupInfo)
     NewsStats should be able to recognize invalid (i.e. officially not existing)
     newsgroups and - optionally - drop them from the list of groups. On the
     other hand, it should recognize existing, but empty groups and add them with
@@ -37,6 +35,19 @@ Bug numbers refer to the Mantis issue tracker at <http://bugs.th-h.de/>.
     NewsStats should offer tools e.g. to inject postings into the 'raw' database,
     or to split databases.
 
+* GroupInfo project
+  - Create a hierarchy information database, containing information on each
+    newsgroup, its creation and removal time, its tagline, charter and
+    moderation status, including the moderator contact address.
+  - Automatically update hierarchy information, e.g. by parsing control messages
+    (with verification!).
+  - Track changes in meta information (changes to tagline, charter, moderation
+    status etc.)
+  - Add tools to query for hierarchy information:
+    - canonical list of newsgroups for any given time
+    - generate list of changes for a time period
+    - find newsgroups (including wildcards) and display their history
+
 * Individual improvements
   + NewsStats.pm
     - Improve error handling when reading config