diff --git a/src/search.c b/src/search.c
index 3df3ca6..1fa52b4 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1415,10 +1415,10 @@
 		{
 		    // Use a space to draw the composing char on.
 		    msgbuf[1] = ' ';
-		    STRNCPY(msgbuf + 2, p, STRLEN(p));
+		    mch_memmove(msgbuf + 2, p, STRLEN(p));
 		}
 		else
-		    STRNCPY(msgbuf + 1, p, STRLEN(p));
+		    mch_memmove(msgbuf + 1, p, STRLEN(p));
 		if (spats[0].off.line || spats[0].off.end || spats[0].off.off)
 		{
 		    p = msgbuf + STRLEN(p) + 1;
@@ -5006,7 +5006,7 @@
 	    else
 		vim_snprintf(t, STAT_BUF_LEN, "[%d/%d]", cur, cnt);
 	}
-	STRNCPY(msgbuf + STRLEN(msgbuf) - STRLEN(t), t, STRLEN(t));
+	mch_memmove(msgbuf + STRLEN(msgbuf) - STRLEN(t), t, STRLEN(t));
 	if (dirc == '?' && cur == 100)
 	    cur = -1;
 
diff --git a/src/version.c b/src/version.c
index 8dee65e..0fa3c41 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1271,
+/**/
     1270,
 /**/
     1269,