diff --git a/src/ChangeLog b/src/ChangeLog
index 435db1b19..382fe69d6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2002-08-31  Pavel Roskin  <proski@gnu.org>
 
+	* help.c (show): Fix segfault on unterminated help files.
+	From David Martin <dmartina@excite.com>
+
 	* key.c (get_event): Reduce scope of select_set.  Don't check
 	mouse_enabled all the time, instead break out of the loop if it
 	becomes 0.
diff --git a/src/help.c b/src/help.c
index 0736f7e80..22cd610c6 100644
--- a/src/help.c
+++ b/src/help.c
@@ -367,7 +367,7 @@ static void show (Dlg_head *h, char *paint_start)
 	if (selected_item < paint_start)
 	    selected_item = NULL;
 	
-	for (p = paint_start; *p != CHAR_NODE_END && line < help_lines; p++){
+	for (p = paint_start; *p && *p != CHAR_NODE_END && line < help_lines; p++) {
 	    c = (unsigned char)*p;
 	    switch (c){
 	    case CHAR_LINK_START: