diff --git a/TODO b/TODO
index d5c4e33..47cfb49 100644
--- a/TODO
+++ b/TODO
@@ -8,34 +8,6 @@ Bugs to fix and Features to add before a 4.2 release
 
 - ambiguous option list with regards to parameters
 
-* xen-create-image --dist=... / sources.list generation should be more fine-grained
-
-   xen-tools should offer the possibility to enabled/disable
-   security/volatile/backports as well as
-   contrib/non-free/universe/restricted/multiverse for each of them
-   not only based on defaults plus the Dom0's sources.list
-
-   One idea is to allow parameters like
-
-   --dist="lenny:main,contrib,non-free;security;volatile:main"
-
-   and maybe (if the default will be to include security) to also
-   allow
-
-   --dist="lenny;no-security"
-
-   The second idea (by Mathieu Parent) is to have an
-   /etc/xen-tools/sources.list.d/ which then contains files like
-   lenny.list, lenny-server.list, karmic.list, etc. which defaults to
-   $dist.list, but can be also select with --sources-list=lenny-server
-   (which looks for ./lenny-server.list, ./lenny-server,
-   /etc/xen-tools/sources.list.d/lenny-server.list and
-   /etc/xen-tools/sources.list.d/lenny-server in that order).
-
-   Third variant is to use /etc/xen-tools/sources.lists/ instead of
-   /etc/xen-tools/sources.list.d/ because that directory is no
-   runparts-like directory.
-
 * Interactive Password Handling
 
    Allow setting the password again if we failed on the first try.
@@ -92,6 +64,34 @@ Bugs to fix and Features to add before a 4.2 release
 Maybe for a 4.3 or 5.0 release
 ------------------------------
 
+* xen-create-image --dist=... / sources.list generation should be more fine-grained
+
+   xen-tools should offer the possibility to enable/disable
+   security/volatile/backports as well as
+   contrib/non-free/universe/restricted/multiverse for each of them
+   not only based on defaults plus the Dom0's sources.list
+
+   One idea is to allow parameters like
+
+   --dist="lenny:main,contrib,non-free;security;volatile:main"
+
+   and maybe (if the default will be to include security) to also
+   allow
+
+   --dist="lenny;no-security"
+
+   The second idea (by Mathieu Parent) is to have an
+   /etc/xen-tools/sources.list.d/ which then contains files like
+   lenny.list, lenny-server.list, karmic.list, etc. which defaults to
+   $dist.list, but can be also select with --sources-list=lenny-server
+   (which looks for ./lenny-server.list, ./lenny-server,
+   /etc/xen-tools/sources.list.d/lenny-server.list and
+   /etc/xen-tools/sources.list.d/lenny-server in that order).
+
+   Third variant is to use /etc/xen-tools/sources.lists/ instead of
+   /etc/xen-tools/sources.list.d/ because that directory is no
+   runparts-like directory.
+
 * LVM snapshot support as an install source.
 
 * Clean up mounts on Ctrl-C, causes error while installing otherwise: