diff --git a/ChangeLog b/ChangeLog
index 3770aca85..fd9831d05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
  - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6. 
    Known issue: Blowfish for SSH1 does not work
  - (stevesk) entropy.c: typo in debug message
+ - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
 20020307
  - (djm) OpenBSD CVS Sync
@@ -7827,4 +7828,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1919 2002/03/11 00:16:34 stevesk Exp $
+$Id: ChangeLog,v 1.1920 2002/03/11 11:53:29 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6aff4a444..2de87167e 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -947,12 +947,10 @@ main(int ac, char **av)
 		do_fingerprint(pw);
 	if (change_passphrase)
 		do_change_passphrase(pw);
-	if (change_comment)
-		do_change_comment(pw);
 	if (convert_to_ssh2)
 		do_convert_to_ssh2(pw);
-	if (convert_from_ssh2)
-		do_convert_from_ssh2(pw);
+	if (change_comment)
+		do_change_comment(pw);
 	if (print_public)
 		do_print_public(pw);
 	if (reader_id != NULL) {
@@ -970,6 +968,9 @@ main(int ac, char **av)
 	seed_rng();
 	arc4random_stir();
 
+	if (convert_from_ssh2)
+		do_convert_from_ssh2(pw);
+
 	if (key_type_name == NULL) {
 		printf("You must specify a key type (-t).\n");
 		usage();