diff --git a/src/apps/fido_u2f/knownapps.py b/src/apps/fido_u2f/knownapps.py
index d56c729b11..7f9ef47de8 100644
--- a/src/apps/fido_u2f/knownapps.py
+++ b/src/apps/fido_u2f/knownapps.py
@@ -3,6 +3,7 @@ from trezor.crypto import hashlib
 knownapps = {
     hashlib.sha256(b'https://bitbucket.org').digest()                            : 'Bitbucket',
     hashlib.sha256(b'https://www.dropbox.com/u2f-app-id.json').digest()          : 'Dropbox',
+    hashlib.sha256(b'https://www.fastmail.com').digest()                         : 'FastMail',
     hashlib.sha256(b'https://github.com/u2f/trusted_facets').digest()            : 'GitHub',
     hashlib.sha256(b'https://gitlab.com').digest()                               : 'GitLab',
     hashlib.sha256(b'https://www.gstatic.com/securitykey/origins.json').digest() : 'Google',
diff --git a/src/apps/fido_u2f/res/u2f_fastmail.toif b/src/apps/fido_u2f/res/u2f_fastmail.toif
new file mode 100644
index 0000000000..3608338518
Binary files /dev/null and b/src/apps/fido_u2f/res/u2f_fastmail.toif differ