diff --git a/ChangeLog b/ChangeLog
index bdd2bfc5c..e443f1c62 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2001/02/07 22:35:46
      [auth1.c auth2.c sshd.c]
      move k_setpag() to a central place; ok dugsong@
+   - markus@cvs.openbsd.org 2001/02/10 12:52:02
+     [auth2.c]
+     offer passwd before s/key
 
 20010210
  - (djm) Sync sftp and scp stuff from OpenBSD:
@@ -3786,4 +3789,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.713 2001/02/10 21:27:11 mouring Exp $
+$Id: ChangeLog,v 1.714 2001/02/10 21:31:53 mouring Exp $
diff --git a/auth2.c b/auth2.c
index bc8c99bda..c887283a3 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2.c,v 1.37 2001/02/07 22:35:46 markus Exp $");
+RCSID("$OpenBSD: auth2.c,v 1.40 2001/02/10 12:52:02 markus Exp $");
 
 #ifdef HAVE_OSF_SIA
 # include <sia.h>
@@ -102,12 +102,12 @@ Authmethod authmethods[] = {
 	{"publickey",
 		userauth_pubkey,
 		&options.pubkey_authentication},
-	{"keyboard-interactive",
-		userauth_kbdint,
-		&options.kbd_interactive_authentication},
 	{"password",
 		userauth_passwd,
 		&options.password_authentication},
+	{"keyboard-interactive",
+		userauth_kbdint,
+		&options.kbd_interactive_authentication},
 	{NULL, NULL, NULL}
 };