diff --git a/Security-Tokens.md b/Security-Tokens.md
index 228b1b5..11202f1 100644
--- a/Security-Tokens.md
+++ b/Security-Tokens.md
@@ -3,8 +3,9 @@
 | Token | Supported? | NFC | USB | supported algos | Implementation |
 |------|------|------|------|------|------|
 | [Fidesmo Card](https://www.fidesmo.com/) | ✔ | ✔ | ❌ | ? | [fork of ykneo-openpgp](https://github.com/fidesmo/ykneo-openpgp) |
-| [Gnuk](https://www.fsij.org/gnuk/) | ✔ >= 1.2.5 | ❌ | OTG | RSA <= 4096, EdDSA, ECDSA (NIST P256, secp256k1), ECDH (X25519, NIST P256, secp256k1) | [gnuk](http://git.gniibe.org/gitweb/?p=gnuk/gnuk.git) |
-| [Nitrokey Start](https://www.nitrokey.com) | ✔ >= 1.2.5 | ❌ | OTG | same as Gnuk | [fork of gnuk](https://github.com/Nitrokey/nitrokey-start-firmware) |
+| [Gnuk](https://www.fsij.org/gnuk/) | ✔ (key gen only on >= 1.2.5) | ❌ | OTG | RSA <= 4096, EdDSA, ECDSA (NIST P256, secp256k1), ECDH (X25519, NIST P256, secp256k1) | [gnuk](http://git.gniibe.org/gitweb/?p=gnuk/gnuk.git) |
+| [Ledger Nano S](https://www.ledger.com/products/ledger-nano-s) | ✔ (no key gen) | ❌ | OTG | [blue-app-openpgp-card](https://github.com/LedgerHQ/blue-app-openpgp-card) |
+| [Nitrokey Start](https://www.nitrokey.com) | ✔ (key gen only on >= 1.2.5) | ❌ | OTG | same as Gnuk | [fork of gnuk](https://github.com/Nitrokey/nitrokey-start-firmware) |
 | [Nitrokey Pro](https://www.nitrokey.com) | ✔ | ❌ | OTG | ? | [nitrokey-pro-firmware CcidLocalAccess.c](https://github.com/Nitrokey/nitrokey-pro-firmware/blob/master/src/ccid/CcidLocalAccess.c) |
 | [Nitrokey Storage](https://www.nitrokey.com) | ✔ | ❌ | OTG | ? | [nitrokey-storage-firmware OpenPGP_V20.c](https://github.com/Nitrokey/nitrokey-storage-firmware/blob/master/src/CCID/LOCAL_ACCESS/OpenPGP_V20.c) |
 | [YubiKey NEO](https://www.yubico.com/products/yubikey-hardware/yubikey-neo/) | ✔ | ✔ | OTG | RSA <= 2048, **[no ECC](https://github.com/Yubico/ykneo-openpgp/issues/12)** | [ykneo-openpgp](https://github.com/yubico/ykneo-openpgp) |
@@ -17,7 +18,6 @@
 
 | Token | Supported? | NFC | USB  | Implementation |
 |------|------|------|------|------|
-| [Ledger Nano S](https://www.ledger.com/products/ledger-nano-s) | NO ([#2135](https://github.com/open-keychain/open-keychain/issues/2135)) | ❌ | OTG | [blue-app-openpgp-card](https://github.com/LedgerHQ/blue-app-openpgp-card) |
 | [TREZOR 2](https://trezor.io/) | NO | ❌ | OTG | Not OpenPGP Card Spec compatible |