diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index 4925695e4c..66d7fa96c7 100644
--- a/src/ex_docmd.c
+++ b/src/ex_docmd.c
@@ -7875,6 +7875,10 @@ ex_cd(eap)
     else
 #endif
     {
+#ifdef FEAT_AUTOCMD
+	if (allbuf_locked())
+	    return;
+#endif
 	if (vim_strchr(p_cpo, CPO_CHDIR) != NULL && curbufIsChanged()
 							     && !eap->forceit)
 	{
diff --git a/src/version.c b/src/version.c
index 8d20bf15c5..e9c7a677d7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    136,
 /**/
     135,
 /**/