diff --git a/TODO b/TODO
index 2dc397cb..c47ed689 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,21 @@
 For 3.1:
+- make sure that KMail supports vnc urls or use files
 - write SLP service template for remote desktop protocols
 
+For 3.2:
+- enhance RFB with SASL authentication (Kerberos)
+- encrypted connection (using SASL and/or SSL/TLS)
 
 Todo (unscheduled features):
 - NAT traversal support if I can find an acceptable implementation
-  (probably using STUN as described in
-   draft-simu-midcom-stun-aware-nat-00.txt) 
+  (probably using TURN, as soon as there is a server and newer spec for that)
 - split krfb into 2 separate programs (server and invitation)
-- user/password authentication mechanism (kerberos)?
-- SSL/TLS support?
 - look into adding an extension to xfree to improve speed (get noticed of
-  screen updates) or maybe use the translucency extensino if finished
+  screen updates)
 - cut & paste support
 
 Known bugs/problems:
-- the IP address sent in invitation may be wrong on multi-homed machines, and it
-  is always incorrect behind a NAT
+- the IP address sent in invitation may be wrong on multi-homed machines, 
+  and it is always incorrect behind a NAT. Right now it is not possible
+  to solve these problems.
+