diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index b3f7619..8a24c0a 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -2705,6 +2705,10 @@
 									TRUE);
 		do_modelines(0);
 	    }
+
+	    /* Autocommands may have changed buffer names, esp. when
+	     * 'autochdir' is set. */
+	    fname = curbuf->b_sfname;
 #endif
 	}
 
diff --git a/src/version.c b/src/version.c
index bd56962..d92f090 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    68,
+/**/
     67,
 /**/
     66,