diff --git a/ChangeLog b/ChangeLog
index 32603360d..e1cccbe44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -36,6 +36,10 @@
      sftp-client.c nchan.c clientloop.c sftp.c misc.c canohost.c channels.c
      ssh-keygen.c progressmeter.c uidswap.c msg.c readconf.c sshconnect.c]
      move #include <errno.h> out of includes.h; ok markus@
+   - stevesk@cvs.openbsd.org 2006/07/11 20:16:43
+     [ssh.c]
+     cast asterisk field precision argument to int to remove warning;
+     ok markus@
 
 20060711
  - (dtucker) [configure.ac ssh-keygen.c openbsd-compat/bsd-openpty.c
@@ -4885,4 +4889,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4397 2006/07/12 12:22:46 dtucker Exp $
+$Id: ChangeLog,v 1.4398 2006/07/12 12:23:35 dtucker Exp $
diff --git a/ssh.c b/ssh.c
index 2e0ef2f9f..100c095dc 100644
--- a/ssh.c
+++ b/ssh.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh.c,v 1.283 2006/07/11 18:50:48 markus Exp $ */
+/* $OpenBSD: ssh.c,v 1.284 2006/07/11 20:16:43 stevesk Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1282,7 +1282,7 @@ env_permitted(char *env)
 
 	if ((cp = strchr(env, '=')) == NULL || cp == env)
 		return (0);
-	ret = snprintf(name, sizeof(name), "%.*s", (cp - env), env);
+	ret = snprintf(name, sizeof(name), "%.*s", (int)(cp - env), env);
 	if (ret <= 0 || (size_t)ret >= sizeof(name))
 		fatal("env_permitted: name '%.100s...' too long", env);