diff --git a/src/option.c b/src/option.c
index b5e53ef..f0d1996 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3654,8 +3654,11 @@
 	if (!(options[i].flags & P_NODEFAULT)
 		&& (opt_flags == 0
 		    || (options[i].var != (char_u *)&p_enc
+#if defined(FEAT_CRYPT)
 			&& options[i].var != (char_u *)&p_cm
-			&& options[i].var != (char_u *)&p_key)))
+			&& options[i].var != (char_u *)&p_key
+#endif
+			)))
 	    set_option_default(i, opt_flags, p_cp);
 
 #ifdef FEAT_WINDOWS
diff --git a/src/version.c b/src/version.c
index 57ff84c..df42759 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    838,
+/**/
     837,
 /**/
     836,