diff --git a/source/components/nitrokeys/features/hsm/index.rst b/source/components/nitrokeys/features/hsm/index.rst
index bec8a37dd8..a58e2f852b 100644
--- a/source/components/nitrokeys/features/hsm/index.rst
+++ b/source/components/nitrokeys/features/hsm/index.rst
@@ -7,10 +7,8 @@ HSM Features
    :maxdepth: 1
 
    S/MIME <../openpgp-card/smime/index>
-   Windows login <../openpgp-card/desktop-login/smart-policy>
    GPA <../openpgp-card/gpa>
    DNSSEC (Linux only) <dnssec>
-   Hard Disk Encryption <../openpgp-card/hard-disk-encryption/index>
    Automatic Screen Lock (Linux only) <../misc/automatic-screen-lock>
    Import Keys Certs <import-keys-certs>
    stunnel (Linux only) <../openpgp-card/stunnel>
@@ -19,3 +17,11 @@ HSM Features
    N-of-m Schemes <n-of-m-schemes>
    PKCS11-URL <pkcs11-url>
    Apache 2 TLS <apache2-tls>
+
+OpenPGP Card Features 
+#####################
+
+The Nitrokey HSM is essentially a more potent OpenPGP Card, thus some of the OpenPGP Card features are also applicable for the HSM - although might need some adjustments.
+
+* `Hard Disk Encryption <../openpgp-card/hard-disk-encryption/index.html>`_
+* `Windows login <../openpgp-card/desktop-login/smart-policy.html>`__