diff --git a/todo b/todo
index 568ff30a3..f386e94a7 100644
--- a/todo
+++ b/todo
@@ -1,41 +1,50 @@
 *** $Id$ ***
 
-Post 0.9.0:
-- alsa mmap driver
-- alsa driver with hw mixing
-- merge module-oss-mmap into module-oss
-- chroot()
-- module-tunnel: improve latency calculation
-- multiline configuration statements
-- use scatter/gather io for sockets
-- rtp module ported to Win32 (sendmsg/recvmsg emulation)
-- CODECs to reduce bandwidth usage (plug-in based)
+Build System:
 - Remove symdef files and use macros (like most other projects)
 - Use own name mangling scheme instead of ltdl's, which will eliminate the
   need for .la files or extra trickery.
-- use software volume when hardware doesn't support all channels (alsa done)
-- paplay needs to set a channel map. our default is only correct for AIFF.
-  (we need help from libsndfile for this)
-- silence generation should be moved into the core to avoid races and code
-  duplication in the backends
-- examine if it is possible to mimic esd's handling of half duplex cards
-  (switch to capture when a recording client connects and drop playback during
-  that time)
-- Fix a way for the threading API to handle state and subscription callbacks
-  in a nice way.
+
+Porting:
+- rtp module ported to Win32 (sendmsg/recvmsg emulation)
+
+I18N:
 - iconv stuff sent from utils to server (UTF-8)
 - iconv sample loading in server
 - Document utf8.h, timeval.h and util.h
 - gettextify polypaudio
+
+Cleanups:
 - drop dependency of libpolyp on libX11, instead use an external mini binary
-- hooks for creating sink inputs
-- insert the low-level device name in the default sink/source name, to make them recognizable
+- merge module-oss-mmap into module-oss
+- module-tunnel: improve latency calculation
+- use software volume when hardware doesn't support all channels (alsa done)
+- silence generation should be moved into the core to avoid races and code
+  duplication in the backends
+- make sure that everyone knows how to deal with sinks without a monitor source
+
+Auth/Crypto:
 - ssl
 - key rings for auth
 - challenge response auth
 - sasl auth 
-- make sure that everyone knows how to deal with sinks without a monitor source
+
+Features:
+- alsa mmap driver
+- alsa driver with hw mixing
 - allow passing data with shared memory between local clients and the server
+- hooks for creating sink inputs/window manager for sound
+- chroot()
+- use scatter/gather io for sockets
+- CODECs to reduce bandwidth usage (plug-in based)
+- multiline configuration statements
+- paplay needs to set a channel map. our default is only correct for AIFF.
+  (we need help from libsndfile for this)
+- Fix a way for the threading API to handle state and subscription callbacks
+  in a nice way.
+- examine if it is possible to mimic esd's handling of half duplex cards
+  (switch to capture when a recording client connects and drop playback during
+  that time)
 
 Long term:
 - pass meta info for hearing impaired