diff --git a/src/os_unix.c b/src/os_unix.c
index 4b2c99e85e..f08adc58b1 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1090,6 +1090,12 @@ deathtrap SIGDEFARG(sigarg)
     /* Remember how often we have been called. */
     ++entered;
 
+#ifdef FEAT_AUTOCMD
+    /* Executing autocommands is likely to use more stack space than we have
+     * available in the signal stack. */
+    block_autocmds();
+#endif
+
 #ifdef FEAT_EVAL
     /* Set the v:dying variable. */
     set_vim_var_nr(VV_DYING, (long)entered);
@@ -1171,6 +1177,8 @@ deathtrap SIGDEFARG(sigarg)
      * calling free(). */
     preserve_exit();
 
+    /* NOTREACHED */
+
 #ifdef NBDEBUG
     reset_signals();
     may_core_dump();
diff --git a/src/version.c b/src/version.c
index 563ac9f1ae..4a2d5378a7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1914,
 /**/
     1913,
 /**/