diff --git a/nitrokey3/linux/keepassxc.rst b/nitrokey3/linux/keepassxc.rst
new file mode 100644
index 0000000000..148bcb82bd
--- /dev/null
+++ b/nitrokey3/linux/keepassxc.rst
@@ -0,0 +1,2 @@
+
+.. include:: ../../software/nk-app2/keepassxc.rst
diff --git a/nitrokey3/mac/keepassxc.rst b/nitrokey3/mac/keepassxc.rst
new file mode 100644
index 0000000000..148bcb82bd
--- /dev/null
+++ b/nitrokey3/mac/keepassxc.rst
@@ -0,0 +1,2 @@
+
+.. include:: ../../software/nk-app2/keepassxc.rst
diff --git a/nitrokey3/windows/keepassxc.rst b/nitrokey3/windows/keepassxc.rst
new file mode 100644
index 0000000000..148bcb82bd
--- /dev/null
+++ b/nitrokey3/windows/keepassxc.rst
@@ -0,0 +1,2 @@
+
+.. include:: ../../software/nk-app2/keepassxc.rst
diff --git a/software/nk-app2/keepassxc.rst b/software/nk-app2/keepassxc.rst
index f110762c99..90e630fbc7 100644
--- a/software/nk-app2/keepassxc.rst
+++ b/software/nk-app2/keepassxc.rst
@@ -8,10 +8,6 @@ These instructions describe how to protect and encrypt a `KeePassXC <https://kee
 
     KeePassXC version 2.7.6 or newer is required.
 
-.. warning::
-
-    The database can no longer be unlocked if the Nitrokey 3 is lost or unavailable! Thus, you may want to set up a second Nitrokey 3 with the same HMAC secret as a backup device.  
-
 First Step: Generate a HMAC Secret With the Nitrokey App 2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
@@ -31,9 +27,13 @@ First Step: Generate a HMAC Secret With the Nitrokey App 2
 6. To generate a secret, there is a button in the field on the right-hand. 
    It is also possible to enter your own secret, as long as it is compliant.
 
-.. important::
+.. warning::
+
+    The database can no longer be unlocked if the Nitrokey 3 is lost or unavailable! Thus, you may want to set up a second Nitrokey 3 with the same HMAC secret as a backup device.  
+
+    .. important::
 
-    The secret can **only** be seen before saving. If the KeePassXC database is to be used with another Nitrokey 3, the challenge-response secret must be copied which is **only** possible **before saving** the credential.
+        The secret can **only** be seen before saving. If the KeePassXC database is to be used with another Nitrokey 3, the HMAC secret must be copied which is **only** possible **before saving** the credential.
 
 7. Click on ``SAVE`` to save the credential