diff --git a/ChangeLog b/ChangeLog
index e793d204c10ad30d56aa80fafeec4eabcaa0069e..d2cfedb3bb256e3710cd99c90ea878d6ea032474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -224,9 +224,12 @@ CVS code -
   get_escape_seq_abcd()
 	- A resurrected version of the old abcd() function, readded in
 	  order to simplify get_escape_seq_kbinput(). (DLR)
-  get_mouse_kbinput()
+  get_mouseinput()
 	- Interpret shortcut key values slightly more stringently when
 	  ungetch()ing them. (DLR)
+  strlenpt()
+	- Properly cast the second parameter of the strnlenpt() call to
+	  size_t. (DLR)
   get_page_start()
 	- For consistency, tweak so that scrolling always occurs when we
 	  try to move onto the "$" at the end of the line, as opposed to
diff --git a/src/winio.c b/src/winio.c
index e7b50294678305757b92a046fb80bab460745f72..d42521862d233c8762cf7ab7e6093d766ee21283 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -926,7 +926,7 @@ size_t strnlenpt(const char *buf, size_t size)
 /* How many columns wide is buf? */
 size_t strlenpt(const char *buf)
 {
-    return strnlenpt(buf, -1);
+    return strnlenpt(buf, (size_t)-1);
 }
 
 void blank_bottombars(void)