diff --git a/ChangeLog b/ChangeLog
index fa0fa628eb0f390b029e5a97d18b0c2d40355d44..15b5cf32daeef7dd2af2a2cc40467ff6791d5d80 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ CVS code -
   shortcut_init()
 	- Simplify wording of nano_gotoline_msg. (Jordi)
 - nano.c:
+  renumber()
+	- When renumbering, properly use a ssize_t instead of an int.
+	  (DLR)
   do_verbatim_input()
 	- If constant cursor position display is on when we finish, make
 	  sure the cursor position is displayed properly. (DLR)
diff --git a/src/nano.c b/src/nano.c
index d21df01cffac0926c884215f0d7e3f8bfda72cdc..87943c2b464f48fe4f28697d934b3f7d588490a2 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -967,12 +967,12 @@ void renumber(filestruct *fileptr)
     if (fileptr == NULL || fileptr->prev == NULL || fileptr == fileage)
 	renumber_all();
     else {
-	int lineno = fileptr->prev->lineno;
+	ssize_t line = fileptr->prev->lineno;
 
 	assert(fileptr != fileptr->next);
 
 	for (; fileptr != NULL; fileptr = fileptr->next)
-	    fileptr->lineno = ++lineno;
+	    fileptr->lineno = ++line;
     }
 }