diff --git a/roadmap.md b/roadmap.md
index aa1127a7..90fd8046 100644
--- a/roadmap.md
+++ b/roadmap.md
@@ -33,16 +33,20 @@
 * ~~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)*
-* Backup system: friend-to-friend, on a local device, and downloaded *(kload)*
 * Run automatic tests on moulinette *(kload)*
 * Fix WebSocket issue for Raspberry Pi *(jerome, kload)*
-* Clean up moulinette API *(jerome)*
 * 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)*
 
-## Backlog
+## v2.2
 
-* Migrate YunoHost to Debian Jessie 8.0
\ No newline at end of file
+* Migrate YunoHost to Debian Jessie
+* Complete and improve backup & restore system *(jerome)*
\ No newline at end of file