diff --git a/roadmap.md b/roadmap.md
index 28d9477b..90fd8046 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -1 +1,52 @@
-#Roadmap
\ No newline at end of file
+#Roadmap
+
+---
+
+## v2.0 RC
+
+* ~~Mail configuration tests *(beudbeud)*~~
+* ~~Make pending apps official *(Ju)*~~
+* ~~SFTP *(kload)*~~
+* ~~DNS zone fix *(kload)*~~
+* ~~SSOwat stuffs (presistent rules, public root website) *(ezpen)*~~
+* ~~Mail forward configuration *(kload, beudbeud)*~~
+* ~~Test and upgrade official apps like Owncloud, Roundcube and Radicale *(packagers)*~~
+* ~~Upgrade function + view *(beudbeud, opi)*~~
+* ~~uPnP rework *(kload, titoko)*~~
+* ~~Add warning in a sample backup view *(opi)*~~
+* ~~User interface design *(Courgette, opi)*~~
+* ~~Moulinette/API refactoring *(jerome)*~~
+* ~~Security check and complete patterns~~
+* ~~I18n *(opi, jerome)*~~
+* ~~Lack of hairpinning hack *(kload)*~~
+
+
+## v2.0
+
+* ~~Add sexiness and a menu to YunoHost.org frontpage *(kload)*~~
+* ~~**DOCUMENTATIONNNNNNN** *(everyone <3)*~~
+
+## v2.1
+
+* ~~Firewall in web administration *(opi)*~~
+* ~~Install non-official apps from admin *(opi)*~~
+* ~~OpenVPN configuration page + access control *(kload)*~~
+* ~~Migrate to Baïkal and deprecate Radicale *(ju)*~~
+* ~~Add a download files button on Transmission interface *(opi)*~~
+* ~~Update Metronome to v3.6 and make a more Debian-friendly package *(jerome)*~~
+* Install and switch to a new build system on a new server *(beudbeud)*
+* Warn users about security updates in the webadmin *(opi)*
+* Implement a simple backup & restore system *(jerome, kload)*
+* Add logging to the moulinette for each action *(jerome)*
+* Review the app manifest format and integrate it *(app maintainers, jerome, opi)*
+* User avatar *(opi)*
+* Run automatic tests on moulinette *(kload)*
+* Fix WebSocket issue for Raspberry Pi *(jerome, kload)*
+* Add proper upgrade/remove scripts and comment Debian scripts in packages *(beudbeud)*
+* Improve documentation, by making it more accessible *(Moul)*
+* Create YunoHost image based on Cubian for Cubieboard 1 ~~and 2~~ *(Moul)*
+
+## v2.2
+
+* Migrate YunoHost to Debian Jessie
+* Complete and improve backup & restore system *(jerome)*
\ No newline at end of file