diff --git a/src/eval.c b/src/eval.c
index 9f70467..0ce6ff1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -12014,6 +12014,7 @@
 	str = get_tv_string_buf(&argvars[1], buf);
 	if (*str != NUL)
 	{
+	    init_history();
 	    add_to_history(histype, str, FALSE, NUL);
 	    rettv->vval.v_number = TRUE;
 	    return;
diff --git a/src/normal.c b/src/normal.c
index 160beb6..befe4ac 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5602,6 +5602,7 @@
 	    STRCAT(buf, "\\>");
 #ifdef FEAT_CMDHIST
 	/* put pattern in search history */
+	init_history();
 	add_to_history(HIST_SEARCH, buf, TRUE, NUL);
 #endif
 	normal_search(cap, cmdchar == '*' ? '/' : '?', buf, 0);
diff --git a/src/version.c b/src/version.c
index 5aae1bb..2798658 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    321,
+/**/
     320,
 /**/
     319,