diff --git a/TODO b/TODO
index db407689d..bac3869cd 100644
--- a/TODO
+++ b/TODO
@@ -13,23 +13,55 @@ Priorities:
   higher priority.
 
 
+Things that must or should be done before 1.0:
+
+* Finish the Multiboot Speicification 0.7. !!!
+
+* Add more --disable-FOO options to configure, so that you can create a
+  minimum GRUB image. This is useful for boot floppies because of the size
+  restriction. !
+
+* Implement a new version of track_int13, using Virtual 8086 Mode. !!!
+
+* Add missing features of graphics support. !!
+
+
+Things that must _not_ be done before 1.0:
+
+* Add configuration inclusion support by adding a command "include". !
+
+* Add automatic configuration support.
+
+* Add bunzip2 support.
+
+* Define the module system.
+
+* Add BSD syntax support, using results of ioprobe to map drives. !
+  (0x1f0-0x1f7 = primary IDE, 0x170-0x176 = secondary,
+   0x1e8-0x1ef = tertiary, 0x168-0x16f = quaternary).
+
+* Add a real scripting language, possibly retaining backward
+  compatibility so that old config files can be used.
+
+* Add internationalization support, emulating gettext as much as is
+  feasible.
+
+* Support other architectures than i386-pc.
+
+* Add real memory management.
+
+
+Things that may be done anytime:
+
 * Port the script ``grub-install'' to FreeBSD, NetBSD and OpenBSD. At
   least you will have to modify the function `convert' so that it can
   translate a native device name into the corresponding GRUB drive
   representation. !
 
-* Add configuration inclusion support by adding a command "include". !
-
 * Add a command to run a GRUB script file. !!
 
-* Finish the Multiboot Speicification 0.7. !!!
-
 * Add commands to manipulate the menu from the command-line interface. !
 
-* Add more --disable-FOO options to configure, so that you can create a
-  minimum GRUB image. This is useful for boot floppies because of the size
-  restriction. !
-
 * Make symbolic links work for BSD FFS.
 
 * Add indirect block support to the BSD FFS filesystem code, so files
@@ -46,18 +78,8 @@ Priorities:
   partition, so that it won't be accidentally erased or modified by
   the kernel.
 
-* Add automatic configuration support.
-
-* Add bunzip2 support.
-
-* Define the module system.
-
 * Add ISA PnP support.
 
-* Add BSD syntax support, using results of ioprobe to map drives. !
-  (0x1f0-0x1f7 = primary IDE, 0x170-0x176 = secondary,
-   0x1e8-0x1ef = tertiary, 0x168-0x16f = quaternary).
-
 * Add more filesystems support (XFS, NTFS, etc.)
 
 * Add more remote console support (parallel and net).
@@ -68,12 +90,6 @@ Priorities:
   this type''.  We need this for clean Hurd install floppies.
   Nope.  Improving the `find' command would solve this problem.
 
-* Add a real scripting language, possibly retaining backward
-  compatibility so that old config files can be used.
-
-* Add internationalization support, emulating gettext as much as is
-  feasible.
-
 * Add CDROM-chainloading support. It would be enough to support only
   BIOSes which have bootable-CDROM support (so you may use the "Bootable
   CDROM" BIOS calls). It is not trivial to support BIOSes without the