diff --git a/src/option.c b/src/option.c
index 192d292..f8e91e4 100644
--- a/src/option.c
+++ b/src/option.c
@@ -927,7 +927,7 @@
     {"cryptmethod", "cm",   P_STRING|P_ALLOCED|P_VI_DEF,
 #ifdef FEAT_CRYPT
 			    (char_u *)&p_cm, PV_CM,
-			    {(char_u *)"zip", (char_u *)0L}
+			    {(char_u *)"blowfish2", (char_u *)0L}
 #else
 			    (char_u *)NULL, PV_NONE,
 			    {(char_u *)0L, (char_u *)0L}
diff --git a/src/version.c b/src/version.c
index 3369480..069feb9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    606,
+/**/
     605,
 /**/
     604,