diff --git a/src/eval.c b/src/eval.c
index 866b40c..4bfc041 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -6792,6 +6792,10 @@
     /* window-local variables */
     FOR_ALL_TAB_WINDOWS(tp, wp)
 	set_ref_in_item(&wp->w_winvar.di_tv, copyID);
+#ifdef FEAT_AUTOCMD
+    if (aucmd_win != NULL)
+	set_ref_in_item(&aucmd_win->w_winvar.di_tv, copyID);
+#endif
 
 #ifdef FEAT_WINDOWS
     /* tabpage-local variables */
diff --git a/src/version.c b/src/version.c
index cf06da6..0e84a04 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    904,
+/**/
     903,
 /**/
     902,