diff --git a/src/os_unix.c b/src/os_unix.c
index e1296c4b55..c6ba2499bd 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -3481,10 +3481,8 @@ mch_settmode(tmode_T tmode)
     if (tmode == TMODE_RAW)
     {
 	// ~ICRNL enables typing ^V^M
-	tnew.c_iflag &= ~ICRNL;
-	// Do not make CTRL-S stop output, for most users it is unexpected and
-	// is hardly ever useful.
-	tnew.c_iflag |= IXON;
+	// ~IXON disables CTRL-S stopping output, so that it can be mapped.
+	tnew.c_iflag &= ~(ICRNL | IXON);
 	tnew.c_lflag &= ~(ICANON | ECHO | ISIG | ECHOE
 # if defined(IEXTEN) && !defined(__MINT__)
 		    | IEXTEN	    // IEXTEN enables typing ^V on SOLARIS
diff --git a/src/version.c b/src/version.c
index b3aa840272..c4728196e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    856,
 /**/
     855,
 /**/