diff --git a/changelog.yml b/changelog.yml
index fa8eccf3..910522a9 100644
--- a/changelog.yml
+++ b/changelog.yml
@@ -6,6 +6,7 @@
     - "More robust error handling"
   bugs:
     - text: "Fix ShareTo being broken in the last release"
+    - text: "Support for non-rsa ssh keys - #516"
 
 - version: "1.76"
   date: 2021-04-23
diff --git a/lib/setup/key_editors.dart b/lib/setup/key_editors.dart
index cfdb91b3..1479d06c 100644
--- a/lib/setup/key_editors.dart
+++ b/lib/setup/key_editors.dart
@@ -24,7 +24,7 @@ class PublicKeyEditor extends StatelessWidget {
     }
 
     val = val.trim();
-    if (!val.startsWith("ssh-rsa ")) {
+    if (!val.startsWith("ssh-rsa ") && !val.startsWith("ecdsa-sha2")) {
       return tr("setup.keyEditors.public");
     }
     return null;