diff --git a/.wordlist.txt b/.wordlist.txt
index 56cd252f4..15159b826 100644
--- a/.wordlist.txt
+++ b/.wordlist.txt
@@ -70,6 +70,7 @@ CalDAV
 CardDAV
 Catppuccin
 CAVA
+CBL
 CCleaner
 CDTV
 CedArctic
@@ -450,6 +451,7 @@ passwd
 passwordless
 PCIe
 petitboot
+Personalisation
 phpBB
 phpMyAdmin
 phpSysInfo
@@ -738,6 +740,7 @@ webserver
 webservers
 WebServers
 webstack
+Webtoons
 WebUI
 whiptail
 WH
diff --git a/docs/assets/images/dietpi-software-media-kavita.jpg b/docs/assets/images/dietpi-software-media-kavita.jpg
new file mode 100644
index 000000000..84f420f0b
Binary files /dev/null and b/docs/assets/images/dietpi-software-media-kavita.jpg differ
diff --git a/docs/software.md b/docs/software.md
index fc87accbc..b42e656b0 100644
--- a/docs/software.md
+++ b/docs/software.md
@@ -203,7 +203,7 @@ description: Overview of ready-to-run DietPi-Software options, cloud & backup se
 - [**Snapcast Server - Multi room audio server**](software/media.md#snapcast-server)
 - [**Snapcast Client - Multi room audio client**](software/media.md#snapcast-client)
 - [**Navidrome - Web interface media streaming server**](software/media.md#navidrome)
-- [**Kavita - Open source comics/mangas/ebooks media server**](software/media.md#kavita)
+- [**Kavita - Your digital library in one place (manga, comics, and books)**](software/media.md#kavita)
 
 ## [Printing Server](software/printing.md)
 
diff --git a/docs/software/media.md b/docs/software/media.md
index cb8e14506..e8e21e6c9 100644
--- a/docs/software/media.md
+++ b/docs/software/media.md
@@ -40,7 +40,7 @@ description: Description of DietPi software options related to media systems lik
 - [**Snapcast Server - Multi room audio server**](#snapcast-server)
 - [**Snapcast Client - Multi room audio client**](#snapcast-client)
 - [**Navidrome - Web interface media streaming server**](#navidrome)
-- [**Kavita - Open source comics/mangas/ebooks media server**](#kavita)
+- [**Kavita - Your digital library in one place (manga, comics, and books)**](#kavita)
 
 ??? info "How do I run **DietPi-Software** and install **optimised software** items?"
     To install any of the **DietPi optimised software items** listed below run from the command line:
@@ -1864,7 +1864,76 @@ License: [GPLv3](https://github.com/navidrome/navidrome/blob/master/LICENSE)
 
 ## Kavita
 
-T.b.d.
+Kavita is a self-hosted library, for comics, manga or books.
+
+![Kavita web interface screenshot](../assets/images/dietpi-software-media-kavita.jpg){: width="600" height="378" loading="lazy"}
+
+A highlight of some of its key features:
+
+- _Versatile Content Support_: Kavita ensures a comprehensive library experience by serving Manga, Webtoons, Comics (`cbr`, `cbz`, `zip`/`rar`/`rar5`, `7zip`, raw images), and ebooks (`epub`, `pdf`).
+
+- _Efficient Organization_ with metadata richness: Kavita has a rich metadata support, enhancing user experience with effective filtering and searching. Users can efficiently organize their reading materials through Collections, Reading Lists (CBL Import), and a _Want to Read feature_, ensuring a well-structured library.
+
+- _Personalisation and Theming_: With support for Dark mode and customizable theming, Kavita allows users to tailor their reading environment according to their preferences for a personalised and visually comfortable experience. It has a responsive interface that works great on any device (phone, tablet, desktop). Dark mode and customizable theming support
+
+=== "Web interface"
+
+    The web interface is accessible via port **2036**:
+    
+    - URL: `http://<your.IP>:2036`
+
+=== "Setup details"
+
+    The configuration directory is located at:
+
+    ```
+    /opt/kavita/config
+    ```
+    
+    For comics and ebooks, the following two directories have been prepared.
+    
+    ```
+    /mnt/dietpi_userdata/comics
+    /mnt/dietpi_userdata/ebooks
+    ```
+    
+    Any other directory could be used, as long as `kavita` or `dietpi` users have read and write permissions.
+
+=== "Service control"
+
+    Kavita runs as `systemd` service and it can be controlled with the following commands:
+
+    ```sh
+    systemctl status kavita
+    ```
+
+    ```sh
+    systemctl start kavita
+    ```
+
+    ```sh
+    systemctl stop kavita
+    ```
+
+    ```sh
+    systemctl restart kavita
+    ```
+
+=== "Logs"
+
+    Kavita runs as systemd service, its logs can be viewed via:
+
+    ```sh
+    journalctl -u kavita
+    ```
+
+=== "Update"
+
+    Kavita can be updated by simply reinstalling it:
+
+    ```sh
+    dietpi-software reinstall 212
+    ```
 
 ***