diff --git a/src/message.c b/src/message.c
index 86db5a882f..5f00c01c08 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1004,7 +1004,7 @@ wait_return(redraw)
 			quit_more = FALSE;
 			got_int = FALSE;
 		    }
-		    else
+		    else if (c != K_IGNORE)
 		    {
 			c = K_IGNORE;
 			hit_return_msg();
diff --git a/src/version.c b/src/version.c
index 3add57dd98..59476e5233 100644
--- a/src/version.c
+++ b/src/version.c
@@ -727,6 +727,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    21,
 /**/
     20,
 /**/