diff --git a/ChangeLog b/ChangeLog
index 5d620d7a..865dacd6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,6 +34,10 @@ CVS code -
 - utils.c:
   regexec_safe()
 	- Rename to safe_regexec() for consistency. (DLR)
+- winio.c:
+  help_line_len()
+	- Make the text display more flexible, and closer to what nano
+	  1.2.x does. (DLR)
 
 GNU nano 1.3.6 - 2005.03.20
 - General:
diff --git a/src/winio.c b/src/winio.c
index e2d7b800..9fd11880 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3828,10 +3828,10 @@ void do_cursorpos_void(void)
 /* Calculate the next line of help_text, starting at ptr. */
 size_t help_line_len(const char *ptr)
 {
-    int help_cols = (COLS > 80) ? COLS - 8 : 72;
+    int help_cols = (COLS > 24) ? COLS - 8 : 24;
 
     /* Try to break the line at (COLS - 8) columns if we have more than
-     * 80 columns, and at 72 columns otherwise. */
+     * 24 columns, and at 24 columns otherwise. */
     size_t retval = break_line(ptr, help_cols, TRUE);
     size_t retval_save = retval;