diff --git a/ChangeLog b/ChangeLog
index f9889b4d8..71fdc4a66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 19991119
  - Merged PAM buffer overrun patch from Chip Salzenberg <chip@valinux.com>
+ - Merged OpenBSD CVS changes
+   - [auth-rhosts.c auth-rsa.c ssh-agent.c sshconnect.c sshd.c]
+     more %d vs. %s in fmt-strings
+   - [authfd.c]
+     Integers should not be printed with %s
 
 19991118
  - Merged OpenBSD CVS changes
diff --git a/auth-rhosts.c b/auth-rhosts.c
index 8f6655d4d..dc82849be 100644
--- a/auth-rhosts.c
+++ b/auth-rhosts.c
@@ -16,7 +16,7 @@ the login based on rhosts authentication.  This file also processes
 */
 
 #include "includes.h"
-RCSID("$Id: auth-rhosts.c,v 1.3 1999/11/15 04:25:10 damien Exp $");
+RCSID("$Id: auth-rhosts.c,v 1.4 1999/11/18 21:25:48 damien Exp $");
 
 #include "packet.h"
 #include "ssh.h"
@@ -213,7 +213,7 @@ int auth_rhosts(struct passwd *pw, const char *client_user)
      group or world writable. */
   if (stat(pw->pw_dir, &st) < 0)
     {
-      log("Rhosts authentication refused for %.100: no home directory %.200s",
+      log("Rhosts authentication refused for %.100s: no home directory %.200s",
 	  pw->pw_name, pw->pw_dir);
       packet_send_debug("Rhosts authentication refused for %.100: no home directory %.200s",
 			pw->pw_name, pw->pw_dir);
diff --git a/auth-rsa.c b/auth-rsa.c
index 6041a3211..f2295078b 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -16,7 +16,7 @@ validity of the host key.
 */
 
 #include "includes.h"
-RCSID("$Id: auth-rsa.c,v 1.7 1999/11/16 02:37:16 damien Exp $");
+RCSID("$Id: auth-rsa.c,v 1.8 1999/11/18 21:25:48 damien Exp $");
 
 #include "rsa.h"
 #include "packet.h"
@@ -265,7 +265,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
 
       /* check the real bits  */
       if (bits != BN_num_bits(n))
-        error("Warning: error in %s, line %d: keysize mismatch: "
+        error("Warning: error in %s, line %ld: keysize mismatch: "
               "actual size %d vs. announced %d.",
               file, linenum, BN_num_bits(n), bits);
 
diff --git a/authfd.c b/authfd.c
index 55ad13e3a..33d09908e 100644
--- a/authfd.c
+++ b/authfd.c
@@ -14,7 +14,7 @@ Functions for connecting the local authentication agent.
 */
 
 #include "includes.h"
-RCSID("$Id: authfd.c,v 1.5 1999/11/17 06:29:08 damien Exp $");
+RCSID("$Id: authfd.c,v 1.6 1999/11/18 21:25:48 damien Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -212,7 +212,7 @@ ssh_get_next_identity(AuthenticationConnection *auth,
   *comment = buffer_get_string(&auth->identities, NULL);
 
   if (bits != BN_num_bits(n))
-    error("Warning: keysize mismatch: actual %d, announced %s",
+    error("Warning: keysize mismatch: actual %d, announced %u",
 	  BN_num_bits(n), bits);
 
   /* Decrement the number of remaining entries. */
diff --git a/ssh-agent.c b/ssh-agent.c
index 743cdb20d..296bb4c76 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $	*/
+/*	$OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $	*/
 
 /*
 
@@ -16,7 +16,7 @@ The authentication agent program.
 */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.18 1999/11/15 20:53:24 markus Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.19 1999/11/18 14:00:49 markus Exp $");
 
 #include "ssh.h"
 #include "rsa.h"
@@ -197,7 +197,7 @@ process_remove_identity(SocketEntry *e)
   buffer_get_bignum(&e->input, n);
 
   if (bits != BN_num_bits(n))
-    error("Warning: keysize mismatch: actual %d, announced %s",
+    error("Warning: keysize mismatch: actual %d, announced %d",
 	  BN_num_bits(n), bits);
   
   /* Check if we have the key. */
diff --git a/sshconnect.c b/sshconnect.c
index 74d41e62a..8b7737446 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -15,7 +15,7 @@ login (authentication) dialog.
 */
 
 #include "includes.h"
-RCSID("$Id: sshconnect.c,v 1.11 1999/11/17 22:28:11 damien Exp $");
+RCSID("$Id: sshconnect.c,v 1.12 1999/11/18 21:25:48 damien Exp $");
 
 #ifdef HAVE_OPENSSL
 #include <openssl/bn.h>
@@ -1354,7 +1354,7 @@ void ssh_login(int host_key_valid,
     if (cipher_mask() & supported_ciphers & (1 << ssh_cipher_default))
       options.cipher = ssh_cipher_default;
     else {
-      debug("Cipher %d not supported, using %.100s instead.",
+      debug("Cipher %s not supported, using %.100s instead.",
 	    cipher_name(ssh_cipher_default),
 	    cipher_name(SSH_FALLBACK_CIPHER));
       options.cipher = SSH_FALLBACK_CIPHER;
diff --git a/sshd.c b/sshd.c
index e3a94bf13..1953807b0 100644
--- a/sshd.c
+++ b/sshd.c
@@ -18,7 +18,7 @@ agent connections.
 */
 
 #include "includes.h"
-RCSID("$Id: sshd.c,v 1.24 1999/11/18 20:56:21 damien Exp $");
+RCSID("$Id: sshd.c,v 1.25 1999/11/18 21:25:48 damien Exp $");
 
 #include "xmalloc.h"
 #include "rsa.h"
@@ -1394,8 +1394,7 @@ do_authloop(struct passwd *pw)
 
         if (bits != BN_num_bits(client_host_key_n))
           error("Warning: keysize mismatch for client_host_key: "
-	        "actual %d, announced %s", BN_num_bits(client_host_key_n), bits);
-  
+	        "actual %d, announced %d", BN_num_bits(client_host_key_n), bits);
 	packet_integrity_check(plen, (4 + ulen) + 4 + elen + nlen, type);
   
 	authenticated = auth_rhosts_rsa(pw, client_user,