diff --git a/src/message.c b/src/message.c
index 86db5a8..5f00c01 100644
--- a/src/message.c
+++ b/src/message.c
@@ -1004,7 +1004,7 @@
 			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 3add57d..59476e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    21,
+/**/
     20,
 /**/
     19,