diff --git a/src/testdir/test_breakindent.in b/src/testdir/test_breakindent.in
index f9d903e..d286931 100644
--- a/src/testdir/test_breakindent.in
+++ b/src/testdir/test_breakindent.in
@@ -100,7 +100,7 @@
 :$put =line2
 :"
 :let g:test="Test 14: breakindent + visual blockwise delete #1"
-:set all& breakindent
+:set all& breakindent viminfo+=nviminfo
 :30vnew
 :normal! 3a1234567890
 :normal! a    abcde
diff --git a/src/version.c b/src/version.c
index 9ead88c..18c41c7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    604,
+/**/
     603,
 /**/
     602,