diff --git a/src/eval.c b/src/eval.c
index a6b2553..3369789 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -11497,6 +11497,7 @@
     }
 
     msg_start();
+    msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
     lines_left = Rows;	/* avoid more prompt */
     msg_scroll = TRUE;
     msg_clr_eos();
diff --git a/src/spell.c b/src/spell.c
index c3bf5b0..8b65336 100644
--- a/src/spell.c
+++ b/src/spell.c
@@ -10071,6 +10071,7 @@
 
 	/* List the suggestions. */
 	msg_start();
+	msg_row = Rows - 1;	/* for when 'cmdheight' > 1 */
 	lines_left = Rows;	/* avoid more prompt */
 	vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"),
 						sug.su_badlen, sug.su_badptr);
diff --git a/src/version.c b/src/version.c
index 6c4c2fd..038e4ac 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    40,
+/**/
     39,
 /**/
     38,