diff --git a/src/getchar.c b/src/getchar.c
index 6602eeac53..cb8a354489 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -110,6 +110,7 @@ free_buff(buffheader_T *buf)
 	vim_free(p);
     }
     buf->bh_first.b_next = NULL;
+    buf->bh_curr = NULL;
 }
 
 /*
diff --git a/src/version.c b/src/version.c
index 49942b5e02..23b29daf30 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4236,
 /**/
     4235,
 /**/