diff --git a/ChangeLog b/ChangeLog
index 346e87961..21e20138b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,7 +24,8 @@
      knf says that a 2nd level indent is four (not three or five) spaces
  -(djm) [audit.c auth1.c auth2.c entropy.c loginrec.c serverloop.c]
   [ssh-rand-helper.c] fix portable 2nd level indents at 4 spaces too
-
+ - (djm) [monitor.c monitor_wrap.c] -Wsign-compare for PAM monitor calls
+ 
 20050716
  - (dtucker) [auth-pam.c] Ensure that only one side of the authentication
    socketpair stays open on in both the monitor and PAM process.  Patch from
@@ -2857,4 +2858,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.3852 2005/07/17 07:26:43 djm Exp $
+$Id: ChangeLog,v 1.3853 2005/07/17 07:53:31 djm Exp $
diff --git a/monitor.c b/monitor.c
index 9dca9c803..ef613cd3c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -869,8 +869,8 @@ int
 mm_answer_pam_query(int sock, Buffer *m)
 {
 	char *name, *info, **prompts;
-	u_int num, *echo_on;
-	int i, ret;
+	u_int i, num, *echo_on;
+	int ret;
 
 	debug3("%s", __func__);
 	sshpam_authok = NULL;
@@ -903,8 +903,8 @@ int
 mm_answer_pam_respond(int sock, Buffer *m)
 {
 	char **resp;
-	u_int num;
-	int i, ret;
+	u_int i, num;
+	int ret;
 
 	debug3("%s", __func__);
 	sshpam_authok = NULL;
diff --git a/monitor_wrap.c b/monitor_wrap.c
index afa612f4e..1489e7f08 100644
--- a/monitor_wrap.c
+++ b/monitor_wrap.c
@@ -764,7 +764,8 @@ mm_sshpam_query(void *ctx, char **name, char **info,
     u_int *num, char ***prompts, u_int **echo_on)
 {
 	Buffer m;
-	int i, ret;
+	u_int i;
+	int ret;
 
 	debug3("%s", __func__);
 	buffer_init(&m);
@@ -790,7 +791,8 @@ int
 mm_sshpam_respond(void *ctx, u_int num, char **resp)
 {
 	Buffer m;
-	int i, ret;
+	u_int i;
+	int ret;
 
 	debug3("%s", __func__);
 	buffer_init(&m);