diff --git a/TODO b/TODO
deleted file mode 100644
index 0197b04..0000000
--- a/TODO
+++ /dev/null
@@ -1,13 +0,0 @@
-
-- fix operation without DISPLAY (over SSH)
-- system to split keys in parts (ssss)
-- transport keys on qrcodes
-- more gtk dialogs and configuration? should keep it minimal!
-- use inotify on /media to watch usb key plug events
-- analyse and show tomb entropy using libdisorder
-- sign and verify tomb script integrity (executed as root)
-- indeep security analysis of possible vulnerabilities
-- bomb the VXXXXXX
-
-to contribute, contact: jaromil@dyne.org
-         ( GPG key on http://pgp.mit.edu )
diff --git a/TODO.org b/TODO.org
new file mode 100644
index 0000000..656da85
--- /dev/null
+++ b/TODO.org
@@ -0,0 +1,49 @@
+
+TODO and Roadmap for Tomb
+
+you are welcome to send patches to jaromil@dyne.org
+
+* TODO Release 1.0							:80%:
+
+** DONE [#A] desktop integration with mime types the freedesktop way :jaromil:
+
+** DONE [#B] debian packaging with desktop integration		    :jaromil:
+
+** DONE [#A] use a posix thread instead of fork for status close    :jaromil:
+
+** TODO [#A] fix operation without DISPLAY (over SSH)		   :hellekin:
+
+** TODO [#A] use a config file to map bind mounts		    :jaromil:
+
+ useful also to choose a default file browser and other things.
+
+ using mount -o bind we can trigger actions to be made after mounting
+ a tomb so that personal directories appear in the home folder.
+
+
+** [#C] make one single status handle more tombs
+
+** [#C] decorate creation wizard with ASCII art
+
+* TODO Release 2.0
+
+100% backward compatible with tombs created with 1.0 
+
+** [#A] use inotify on /media to watch usb key plug events
+
+** [#A] udev rules to avoid usb automount of keyplug in gnome
+
+** [#A] sign and verify tomb script integrity (executed as root)
+
+** [#B] system to split keys in parts (ssss)
+
+** [#B] transport keys and integrity checksums on qrcodes
+
+** [#B] analyse and show tomb entropy using libdisorder
+
+** [#B] indeep security analysis of possible vulnerabilities
+
+** [#C] more gtk dialogs for configurations? keep it minimal!
+
+** [#C] bomb the V...... and shoot the P...
+
diff --git a/configure.ac b/configure.ac
index 13ca5e1..b451c63 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl ==============================================================
 
 AC_PREREQ([2.60])
 
-AC_INIT([Tomb],[0.9.1],[jaromil@dyne.org],[Tomb])
+AC_INIT([Tomb],[0.9.2],[jaromil@dyne.org],[Tomb])
 AC_CONFIG_MACRO_DIR([m4])
 
 AC_CANONICAL_HOST