diff --git a/src/undo.c b/src/undo.c
index 7736f54..27e2218 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -116,7 +116,9 @@
 static void corruption_error(char *mesg, char_u *file_name);
 static void u_free_uhp(u_header_T *uhp);
 static int undo_write(bufinfo_T *bi, char_u *ptr, size_t len);
+# ifdef FEAT_CRYPT
 static int undo_flush(bufinfo_T *bi);
+# endif
 static int fwrite_crypt(bufinfo_T *bi, char_u *ptr, size_t len);
 static int undo_write_bytes(bufinfo_T *bi, long_u nr, int len);
 static void put_header_ptr(bufinfo_T *bi, u_header_T *uhp);
diff --git a/src/version.c b/src/version.c
index 9fb2cdb..9c25274 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1358,
+/**/
     1357,
 /**/
     1356,