diff --git a/ChangeLog b/ChangeLog
index 5df4094c1..3cd16e480 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+20121030
+ - (djm) OpenBSD CVS Sync
+   - markus@cvs.openbsd.org 2012/10/05 12:34:39
+     [sftp.c]
+     fix signed vs unsigned warning; feedback & ok: djm@
+
 20121019
  - (tim) [buildpkg.sh.in] Double up on some backslashes so they end up in
    the generated file as intended.
diff --git a/sftp.c b/sftp.c
index 7b91e0013..6516d1f1c 100644
--- a/sftp.c
+++ b/sftp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sftp.c,v 1.140 2012/09/21 10:55:04 dtucker Exp $ */
+/* $OpenBSD: sftp.c,v 1.141 2012/10/05 12:34:39 markus Exp $ */
 /*
  * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org>
  *
@@ -991,7 +991,7 @@ makeargv(const char *arg, int *argcp, int sloppy, char *lastquote,
 	state = MA_START;
 	i = j = 0;
 	for (;;) {
-		if (argc >= sizeof(argv) / sizeof(*argv)){
+		if ((size_t)argc >= sizeof(argv) / sizeof(*argv)){
 			error("Too many arguments.");
 			return NULL;
 		}