diff --git a/docs/TODO b/docs/TODO
index d66be0c7c..4723a0992 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -3,15 +3,7 @@
 
     - provide icons for every pkg category (and group?) in
         /usr/share/pixmaps/entropy/<cat_name>.png
-    - PackageKit integration
     - entropy.security.System unittest
-    - entropy.server API docs
-    - add splitdebug support?
-    - move all the portage related stuff in entropy.tools to entropy.spm.metaphor
-    - Spm.extract_package_metadata, define metadata format (to make easier
-        for 3rd party implementations to define it)
-
-  1.0_beta1:
 
     - entropy.exceptions rework
         - ditch exceptions: InvalidData, InvalidDataType, IncorrectParameter
@@ -24,6 +16,18 @@
         - unpack & install should be done in entropy.spm
         - entropy.db => retrieveVersionTag => retrieveTag
         - move SystemSettings['repositories'] ?
+
+
+
+  0.99.50:
+    - entropy.server API docs
+    - add splitdebug support?
+    - move all the portage related stuff in entropy.tools to entropy.spm.metaphor
+    - Spm.extract_package_metadata, define metadata format (to make easier
+        for 3rd party implementations to define it)
+
+  1.0_beta1:
+
     - entropy.db.search* unittest
     - entropy package metadata .dtd specs
     - complete API documentation