diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
index edb662e524..19b9d351f9 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -1,269 +1,272 @@
 <?php
 
 final class PhabricatorSettingsPanelSSHKeys
   extends PhabricatorSettingsPanel {
 
   public function getPanelKey() {
     return 'ssh';
   }
 
   public function getPanelName() {
     return pht('SSH Public Keys');
   }
 
   public function getPanelGroup() {
     return pht('Authentication');
   }
 
   public function isEnabled() {
     return true;
   }
 
   public function processRequest(AphrontRequest $request) {
 
     $user = $request->getUser();
 
     $edit = $request->getStr('edit');
     $delete = $request->getStr('delete');
     if (!$edit && !$delete) {
       return $this->renderKeyListView($request);
     }
 
     $id = nonempty($edit, $delete);
 
     if ($id && is_numeric($id)) {
       // NOTE: Prevent editing/deleting of keys you don't own.
       $key = id(new PhabricatorUserSSHKey())->loadOneWhere(
         'userPHID = %s AND id = %d',
         $user->getPHID(),
         (int)$id);
       if (!$key) {
         return new Aphront404Response();
       }
     } else {
       $key = new PhabricatorUserSSHKey();
       $key->setUserPHID($user->getPHID());
     }
 
     if ($delete) {
       return $this->processDelete($request, $key);
     }
 
     $e_name = true;
     $e_key = true;
     $errors = array();
     $entire_key = $key->getEntireKey();
     if ($request->isFormPost()) {
       $key->setName($request->getStr('name'));
       $entire_key = $request->getStr('key');
 
       if (!strlen($entire_key)) {
         $errors[] = pht('You must provide an SSH Public Key.');
         $e_key = pht('Required');
       } else {
         $parts = str_replace("\n", '', trim($entire_key));
         $parts = preg_split('/\s+/', $parts);
         if (count($parts) == 2) {
           $parts[] = ''; // Add an empty comment part.
         } else if (count($parts) == 3) {
           // This is the expected case.
         } else {
           if (preg_match('/private\s*key/i', $entire_key)) {
             // Try to give the user a better error message if it looks like
             // they uploaded a private key.
             $e_key = pht('Invalid');
             $errors[] = pht('Provide your public key, not your private key!');
           } else {
             $e_key = pht('Invalid');
             $errors[] = pht('Provided public key is not properly formatted.');
           }
         }
 
         if (!$errors) {
           list($type, $body, $comment) = $parts;
 
           $recognized_keys = array(
             'ssh-dsa',
+            'ssh-dss',
             'ssh-rsa',
             'ecdsa-sha2-nistp256',
+            'ecdsa-sha2-nistp384',
+            'ecdsa-sha2-nistp521',
           );
 
           if (!in_array($type, $recognized_keys)) {
             $e_key = pht('Invalid');
             $type_list = implode(', ', $recognized_keys);
             $errors[] = pht('Public key should be one of: %s', $type_list);
           } else {
             $key->setKeyType($type);
             $key->setKeyBody($body);
             $key->setKeyHash(md5($body));
             $key->setKeyComment($comment);
 
             $e_key = null;
           }
         }
       }
 
       if (!strlen($key->getName())) {
         $errors[] = pht('You must name this public key.');
         $e_name = pht('Required');
       } else {
         $e_name = null;
       }
 
       if (!$errors) {
         try {
           $key->save();
           return id(new AphrontRedirectResponse())
             ->setURI($this->getPanelURI());
         } catch (AphrontQueryDuplicateKeyException $ex) {
           $e_key = pht('Duplicate');
           $errors[] = pht('This public key is already associated with a user '.
                       'account.');
         }
       }
     }
 
     $error_view = null;
     if ($errors) {
       $error_view = new AphrontErrorView();
       $error_view->setTitle(pht('Form Errors'));
       $error_view->setErrors($errors);
     }
 
     $is_new = !$key->getID();
 
     if ($is_new) {
       $header = pht('Add New SSH Public Key');
       $save = pht('Add Key');
     } else {
       $header = pht('Edit SSH Public Key');
       $save   = pht('Save Changes');
     }
 
     $form = id(new AphrontFormView())
       ->setUser($user)
       ->addHiddenInput('edit', $is_new ? 'true' : $key->getID())
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
           ->setName('name')
           ->setValue($key->getName())
           ->setError($e_name))
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Public Key'))
           ->setName('key')
           ->setValue($entire_key)
           ->setError($e_key))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($this->getPanelURI())
           ->setValue($save));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($header)
       ->setFormError($error_view)
       ->setForm($form);
 
     return $form_box;
   }
 
   private function renderKeyListView(AphrontRequest $request) {
 
     $user = $request->getUser();
 
     $keys = id(new PhabricatorUserSSHKey())->loadAllWhere(
       'userPHID = %s',
       $user->getPHID());
 
     $rows = array();
     foreach ($keys as $key) {
       $rows[] = array(
         phutil_tag(
           'a',
           array(
             'href' => $this->getPanelURI('?edit='.$key->getID()),
           ),
           $key->getName()),
         $key->getKeyComment(),
         $key->getKeyType(),
         phabricator_date($key->getDateCreated(), $user),
         phabricator_time($key->getDateCreated(), $user),
         javelin_tag(
           'a',
           array(
             'href' => $this->getPanelURI('?delete='.$key->getID()),
             'class' => 'small grey button',
             'sigil' => 'workflow',
           ),
           pht('Delete')),
       );
     }
 
     $table = new AphrontTableView($rows);
     $table->setNoDataString(pht("You haven't added any SSH Public Keys."));
     $table->setHeaders(
       array(
         pht('Name'),
         pht('Comment'),
         pht('Type'),
         pht('Created'),
         pht('Time'),
         '',
       ));
     $table->setColumnClasses(
       array(
         'wide pri',
         '',
         '',
         '',
         'right',
         'action',
       ));
 
     $panel = new AphrontPanelView();
     $panel->addButton(
       phutil_tag(
         'a',
         array(
           'href' => $this->getPanelURI('?edit=true'),
           'class' => 'green button',
         ),
         pht('Add New Public Key')));
     $panel->setHeader(pht('SSH Public Keys'));
     $panel->appendChild($table);
     $panel->setNoBackground();
 
     return $panel;
   }
 
   private function processDelete(
     AphrontRequest $request,
     PhabricatorUserSSHKey $key) {
 
     $user = $request->getUser();
 
     $name = phutil_tag('strong', array(), $key->getName());
 
     if ($request->isDialogFormPost()) {
       $key->delete();
       return id(new AphrontReloadResponse())
         ->setURI($this->getPanelURI());
     }
 
     $dialog = id(new AphrontDialogView())
       ->setUser($user)
       ->addHiddenInput('delete', $key->getID())
       ->setTitle(pht('Really delete SSH Public Key?'))
       ->appendChild(phutil_tag('p', array(), pht(
         'The key "%s" will be permanently deleted, and you will not longer be '.
           'able to use the corresponding private key to authenticate.',
         $name)))
       ->addSubmitButton(pht('Delete Public Key'))
       ->addCancelButton($this->getPanelURI());
 
     return id(new AphrontDialogResponse())
       ->setDialog($dialog);
   }
 
 }