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
 	}