diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b5278f1..177a569 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2370,7 +2370,7 @@
 
 
 						*'cryptmethod'* *'cm'*
-'cryptmethod' 'cm'	string	(default "zip")
+'cryptmethod' 'cm'	string	(default "blowfish2")
 			global or local to buffer |global-local|
 			{not in Vi}
 	Method used for encryption when the buffer is written to a file:
@@ -2401,8 +2401,8 @@
 	modifications.  Also see |:X|.
 
 	When setting the global value to an empty string, it will end up with
-	the value "zip".  When setting the local value to an empty string the
-	buffer will use the global value.
+	the value "blowfish2".  When setting the local value to an empty
+	string the buffer will use the global value.
 
 	When a new encryption method is added in a later version of Vim, and
 	the current version does not recognize it, you will get	*E821* .
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,