diff --git a/app_bookstack.md b/app_bookstack.md
new file mode 100644
index 00000000..c46091ed
--- /dev/null
+++ b/app_bookstack.md
@@ -0,0 +1,16 @@
+# <img src="/images/logo-bookstack.png" height="80px" alt="BookStack Logo"> BookStack
+
+[![Install BookStack with YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bookstack) [![Integration level](https://dash.yunohost.org/integration/bookstack.svg)](https://dash.yunohost.org/appci/app/bookstack)
+
+### Index
+
+- [Useful links](#useful-links)
+
+BookStack is a simple, self-hosted, easy-to-use platform for organising and storing information.
+
+## Useful links
+
++ Website: [bookstackapp.com](https://www.bookstackapp.com/)
++ Official documentation: [bookstackapp.com/docs](https://www.bookstackapp.com/docs/)
++ Application software repository: [github.com - YunoHost-Apps/bookstack](https://github.com/YunoHost-Apps/bookstack_ynh)
++ Fix a bug or an improvement by creating a ticket (issue): [github.com - YunoHost-Apps/bookstack/issues](https://github.com/YunoHost-Apps/bookstack_ynh/issues)
diff --git a/app_bookstack_fr.md b/app_bookstack_fr.md
new file mode 100644
index 00000000..489d7001
--- /dev/null
+++ b/app_bookstack_fr.md
@@ -0,0 +1,17 @@
+# <img src="/images/logo-bookstack.png" height="80px" alt="Logo BookStack"> BookStack
+
+[![Installer BookStack avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.png)](https://install-app.yunohost.org/?app=bookstack) [![Integration level](https://dash.yunohost.org/integration/bookstack.svg)](https://dash.yunohost.org/appci/app/bookstack)
+
+### Index
+
+- [Liens utiles](#useful-links)
+
+BookStack est une plate-forme simple, auto-hébergée et facile à utiliser pour organiser et stocker des informations.
+
+
+## Liens utiles
+
++ Site web : [bookstackapp.com](https://www.bookstackapp.com/)
++ Documentation officielle : [bookstackapp.com/docs](https://www.bookstackapp.com/docs/)
++ Dépôt logiciel de l'application : [github.com - YunoHost-Apps/bookstack](https://github.com/YunoHost-Apps/bibliogram_ynh)
++ Remonter un bug ou une amélioration en créant un ticket (issue) : [github.com - YunoHost-Apps/bookstack/issues](https://github.com/YunoHost-Apps/bookstack_ynh/issues)
\ No newline at end of file
diff --git a/apps_wishlist.md b/apps_wishlist.md
index 81a415b4..96c2f785 100644
--- a/apps_wishlist.md
+++ b/apps_wishlist.md
@@ -23,7 +23,6 @@ You can [contribute to this list by adding something you'd like to be packaged](
 | [Bitmessage](https://bitmessage.org/) |  | [Upstream](https://github.com/Bitmessage/PyBitmessage) |  |
 | Blynk |  | [Upstream](https://github.com/blynkkk/blynk-library) |  |
 | [Bolt](https://bolt.cm/) | Content Management Tool |  | [Package Draft](https://github.com/realitygaps/bolt_ynh) |
-| [Bookstack](https://www.bookstackapp.com/) |  | [Upstream](https://github.com/BookStackApp/BookStack) |  |
 | BookWyrm | Social reading and reviewing, decentralized with ActivityPub | [Upstream](https://github.com/mouse-reeve/bookwyrm) |  |
 | BTCPay Server |  | [Upstream](https://github.com/btcpayserver/btcpayserver) |  |
 | [Cagette](https://www.cagette.net/) | A marketplace for local farmers and producers | [Upstream](https://github.com/CagetteNet/cagette) | |
diff --git a/appsdoc.md b/appsdoc.md
index 11a468d2..82317bf4 100644
--- a/appsdoc.md
+++ b/appsdoc.md
@@ -9,6 +9,7 @@
 - [Bibliogram](app_bibliogram)
 - [Bludit](app_bludit)
 - [Blogotext](app_blogotext)
+- [BookStack](app_bookstack)
 - [Borg](app_borg)
 - [BoZoN](app_bozon)
 - [Calibre-Web](app_calibreweb)
diff --git a/images/logo-bookstack.png b/images/logo-bookstack.png
new file mode 100644
index 00000000..d10b3ca4
Binary files /dev/null and b/images/logo-bookstack.png differ