diff --git a/THANKS b/THANKS
index bfd59fc13..71e8e5f28 100644
--- a/THANKS
+++ b/THANKS
@@ -48,6 +48,7 @@ Colin Tuckley              colin at tuckley.org
 Daiki Ueno                 ueno at unixuser.org
 Dan Winship                danw at helixcode.com
 Daniel Eisenbud 	   eisenbud at cs.swarthmore.edu
+Daniel Kahn Gillmor        dkg at fifthhorseman dot net
 Daniel Koening		   dan at chaosdorf.de
 Daniel Leidert             daniel leidert at wgdd.de
 Daniel Resare		   daniel at resare.com
diff --git a/tools/ChangeLog b/tools/ChangeLog
index fc497bed1..b7cd7d53d 100644
--- a/tools/ChangeLog
+++ b/tools/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08  Werner Koch  <wk@g10code.com>
+
+	* gpgkey2ssh.c (main): Change order of output for RSA. Change name
+	of DSA identifier.  Reported by Daniel Kahn Gillmor.  This is
+	bug#901.
+
 2008-12-05  Werner Koch  <wk@g10code.com>
 
 	* gpg-connect-agent.c (opts): Use ARGPARSE_ macros.
diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
index 0c0985d41..903fb5bd6 100644
--- a/tools/gpgkey2ssh.c
+++ b/tools/gpgkey2ssh.c
@@ -1,4 +1,4 @@
-/* gpgkey2ssh.c - Converter ...
+/* gpgkey2ssh.c - Converter  (Debug helper)
  *	Copyright (C) 2005 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
@@ -17,6 +17,15 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
+/* 
+   FIXME:  This tool needs some cleanup:
+
+   - Do not use assert() for error output.
+   - Add proper option parsing and standard options.
+   - retrieve_key_material needs to take the ordinal at field 1 in account.
+   0 Write a man page.
+*/
+
 #include <config.h>
 
 #include <gcrypt.h>
@@ -272,11 +281,11 @@ main (int argc, char **argv)
     {
       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);
     }