diff --git a/src/misc2.c b/src/misc2.c
index fd0405f..6a562d8 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -751,7 +751,7 @@
 #endif
 
 /*
- * Note: if unsinged is 16 bits we can only allocate up to 64K with alloc().
+ * Note: if unsigned is 16 bits we can only allocate up to 64K with alloc().
  * Use lalloc for larger blocks.
  */
     char_u *
@@ -1082,7 +1082,11 @@
     win_free_all();
 #endif
 
-    /* Free all buffers. */
+    /* Free all buffers.  Reset 'autochdir' to avoid accessing things that
+     * were freed already. */
+#ifdef FEAT_AUTOCHDIR
+    p_acd = FALSE;
+#endif
     for (buf = firstbuf; buf != NULL; )
     {
 	nextbuf = buf->b_next;
diff --git a/src/version.c b/src/version.c
index c2f7e97..f857903 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    289,
+/**/
     288,
 /**/
     287,