Index: gnupg2-2.0.9/tools/gpgkey2ssh.c
===================================================================
--- gnupg2-2.0.9/tools/gpgkey2ssh.c
+++ gnupg2-2.0.9/tools/gpgkey2ssh.c
@@ -272,11 +272,11 @@
     {
       identifier = "ssh-rsa";
       ret = key_to_blob (&blob, &blob_n, identifier,
-			 &pkdbuf[0], &pkdbuf[1], NULL);
+			 &pkdbuf[1], &pkdbuf[0], NULL);
     }
   else if (algorithm_id == 17)
     {
-      identifier = "ssh-dsa";
+      identifier = "ssh-dss";
       ret = key_to_blob (&blob, &blob_n, identifier,
 			 &pkdbuf[0], &pkdbuf[1], &pkdbuf[2], &pkdbuf[3], NULL);
     }