diff --git a/src/option.c b/src/option.c
index 48a8048cb9..4ba436341d 100644
--- a/src/option.c
+++ b/src/option.c
@@ -5936,6 +5936,7 @@ did_set_string_option(
 	    /* Both 'term' and 'ttytype' point to T_NAME, only set the
 	     * P_ALLOCED flag on 'term'. */
 	    opt_idx = findoption((char_u *)"term");
+	    free_oldval = (options[opt_idx].flags & P_ALLOCED);
 	}
     }
 
diff --git a/src/version.c b/src/version.c
index 64e11118b5..94a325beb5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    356,
 /**/
     355,
 /**/