diff --git a/roadmap.md b/roadmap.md
new file mode 100644
index 00000000..71fbd909
--- /dev/null
+++ b/roadmap.md
@@ -0,0 +1,21 @@
+#Roadmap
+
+---
+
+## v2.0
+
+* User interface design *(Courgette, opi)*
+* uPnP rework *(kload, titoko)*
+* Moulinette/API refactoring *(jerome)*
+* Mail configuration tests *(beudbeud)*
+* Make pending apps official *(Ju)*
+* Test and upgrade official apps like Owncloud, Roundcube and Radicale *(packagers)*
+* Add warning in a sample backup view *(opi)*
+* SFTP *(kload)*
+* Security check and complete patterns
+* Add sexiness and a menu to YunoHost.org frontpage *(kload)*
+* **DOCUMENTATIONNNNNNN** *(everyone <3)*
+
+## v2.1
+
+* TO DO
\ No newline at end of file