diff --git a/README.md b/README.md
index 69bb8c1..659b6d0 100644
--- a/README.md
+++ b/README.md
@@ -1,33 +1,34 @@
-# Diaspora* for YunoHost
+<!--
+N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/README-generator
+It shall NOT be edited by hand.
+-->
 
-[![Integration level](https://dash.yunohost.org/integration/diaspora.svg)](https://dash.yunohost.org/appci/app/diaspora) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.maintain.svg)[![Shipped version](https://img.shields.io/github/v/release/yunohost-apps/diaspora_ynh)](https://github.com/yunohost-apps/diaspora_ynh/releases)  
+# Diaspora for YunoHost
+
+[![Integration level](https://dash.yunohost.org/integration/diaspora.svg)](https://dash.yunohost.org/appci/app/diaspora) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.maintain.svg)  
 [![Install Diaspora with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diaspora)
 
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *This package allows you to install Diaspora quickly and simply on a YunoHost server.
+If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.*
+
 ## Overview
 
-> *This package allow you to install Diaspora\* quickly and simply on a YunoHost server.  
-If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to know how to install and enjoy it.*
+Distributed social networking service
 
-**Shipped version:** 0.7.13.0
+**Shipped version:** 0.7.16.0~ynh1
 
-## Notes
 
-Before installing, you have to:
 
-- get a dedicated domain (must install under web root like **https://diaspora.example.com/** not **https://example.com/diaspora/**)
-- get a valid SSL certificate
+## Documentation and resources
 
-Installation effects:
-
-- Thank you for being patient as deployment time can take up to about 1 hour (raspberry pi).
-- The installation directory can take up to 900MB and app start time can be take 5 minutes
-
-## Links
-
- * Report a bug: https://github.com/YunoHost-Apps/diaspora_ynh/issues
- * YunoHost website: https://yunohost.org/
-
----
+* Official app website: https://diasporafoundation.org/
+* Official user documentation: https://wiki.diasporafoundation.org/FAQ_for_users
+* Official admin documentation: https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers
+* Upstream app code repository: https://github.com/diaspora/diaspora
+* YunoHost documentation for this app: https://yunohost.org/app_diaspora
+* Report a bug: https://github.com/YunoHost-Apps/diaspora_ynh/issues
 
 ## Developer info
 
@@ -39,3 +40,5 @@ sudo yunohost app install https://github.com/YunoHost-Apps/diaspora_ynh/tree/tes
 or
 sudo yunohost app upgrade diaspora -u https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
 ```
+
+**More info regarding app packaging:** https://yunohost.org/packaging_apps
\ No newline at end of file
diff --git a/README_fr.md b/README_fr.md
new file mode 100644
index 0000000..04a4e50
--- /dev/null
+++ b/README_fr.md
@@ -0,0 +1,40 @@
+# Diaspora pour YunoHost
+
+[![Niveau d'intégration](https://dash.yunohost.org/integration/diaspora.svg)](https://dash.yunohost.org/appci/app/diaspora) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.status.svg) ![](https://ci-apps.yunohost.org/ci/badges/diaspora.maintain.svg)  
+[![Installer Diaspora avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=diaspora)
+
+*[Read this readme in english.](./README.md)*
+*[Lire ce readme en français.](./README_fr.md)*
+
+> *Ce package vous permet d'installer Diaspora rapidement et simplement sur un serveur YunoHost.
+Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l'installer et en profiter.*
+
+## Vue d'ensemble
+
+Service de réseau social distribué
+
+**Version incluse :** 0.7.16.0~ynh1
+
+
+
+## Documentations et ressources
+
+* Site officiel de l'app : https://diasporafoundation.org/
+* Documentation officielle utilisateur : https://wiki.diasporafoundation.org/FAQ_for_users
+* Documentation officielle de l'admin : https://wiki.diasporafoundation.org/FAQ_for_pod_maintainers
+* Dépôt de code officiel de l'app : https://github.com/diaspora/diaspora
+* Documentation YunoHost pour cette app : https://yunohost.org/app_diaspora
+* Signaler un bug : https://github.com/YunoHost-Apps/diaspora_ynh/issues
+
+## Informations pour les développeurs
+
+Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing).
+
+Pour essayer la branche testing, procédez comme suit.
+```
+sudo yunohost app install https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
+ou
+sudo yunohost app upgrade diaspora -u https://github.com/YunoHost-Apps/diaspora_ynh/tree/testing --debug
+```
+
+**Plus d'infos sur le packaging d'applications :** https://yunohost.org/packaging_apps
\ No newline at end of file