diff --git a/src/misc1.c b/src/misc1.c
index 9581631..11f456b 100644
--- a/src/misc1.c
+++ b/src/misc1.c
@@ -10887,7 +10887,14 @@
 	buffer = NULL;
     }
     else
+    {
+	/* Change NUL into SOH, otherwise the string is truncated. */
+	for (i = 0; i < len; ++i)
+	    if (buffer[len] == NUL)
+		buffer[len] = 1;
+
 	buffer[len] = NUL;	/* make sure the buffer is terminated */
+    }
 
 done:
     vim_free(tempname);
diff --git a/src/version.c b/src/version.c
index 676245d..bf7c0e1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    12,
+/**/
     11,
 /**/
     10,