diff --git a/TODO b/TODO
index d02a0d29..ae6ff135 100644
--- a/TODO
+++ b/TODO
@@ -1,22 +1,5 @@
 Hey Emacs, this is -*- org -*- mode!
 
-* Document all the new stuff.
-  :PROPERTIES:
-  :CUSTOM_ID: more-docs-is-better
-  :END:
-** TODO Fix this TODO list.
-   :PROPERTIES:
-   :CUSTOM_ID: fix-todo
-   :END:
-   Clean up the current TODO list.  Include properties as relevant (so
-   if someone does make a PDF or HTML version the TOC will work).
-
-   Also check ans see if some of these ancient things can be removed
-   (e.g. do we really need to fix things that were broken in GPG
-   1.3.x?  I'm thinking not so much).
-
-
-
 * Fix the remaining UI Server problems:
   :PROPERTIES:
   :CUSTOM_ID: ui-server-fix
@@ -264,27 +247,42 @@ Hey Emacs, this is -*- org -*- mode!
   :PROPERTIES:
   :CUSTOM_ID: documentation
   :END:
+
 ** TODO Document validity and trust issues.
    :PROPERTIES:
    :CUSTOM_ID: valid-trust-issues
    :END:
+
 ** In gpgme.texi: Register callbacks under the right letter in the index.
    :PROPERTIES:
    :CUSTOM_ID: gpgme-texi
    :END:
-** TODO Update TODO file
+
+** Document all the new stuff.
    :PROPERTIES:
-   :CUSTOM_ID: todo-update
+   :CUSTOM_ID: more-docs-is-better
    :END:
 
-*** DONE fix TODO items
-    CLOSED: [2018-03-04 Sun 08:55]
+*** TODO Fix this TODO list.
     :PROPERTIES:
-    :CUSTOM_ID: fix-todo-items
+    :CUSTOM_ID: fix-todo
     :END:
 
-    Adjust todo items so each can now be referenced by custom-id and
-    checked off as necessary.
+    Clean up the current TODO list.  Include properties as relevant (so
+    if someone does make a PDF or HTML version the TOC will work).
+
+    Also check ans see if some of these ancient things can be removed
+    (e.g. do we really need to fix things that were broken in GPG
+    1.3.x?  I'm thinking not so much).
+
+**** DONE fix TODO items
+     CLOSED: [2018-03-04 Sun 08:55]
+     :PROPERTIES:
+     :CUSTOM_ID: fix-todo-items
+     :END:
+
+     Adjust todo items so each can now be referenced by custom-id and
+     checked off as necessary.
 
 * Engines
   :PROPERTIES: