diff --git a/src/term.c b/src/term.c
index d269eb8..e9a9004 100644
--- a/src/term.c
+++ b/src/term.c
@@ -2071,21 +2071,24 @@
 	check_map_keycodes();	// check mappings for terminal codes used
 
 	{
-	    bufref_T	old_curbuf;
+	    buf_T	*buf;
+	    aco_save_T	aco;
 
 	    /*
 	     * Execute the TermChanged autocommands for each buffer that is
 	     * loaded.
 	     */
-	    set_bufref(&old_curbuf, curbuf);
-	    FOR_ALL_BUFFERS(curbuf)
+	    FOR_ALL_BUFFERS(buf)
 	    {
 		if (curbuf->b_ml.ml_mfp != NULL)
+		{
+		    aucmd_prepbuf(&aco, buf);
 		    apply_autocmds(EVENT_TERMCHANGED, NULL, NULL, FALSE,
 								      curbuf);
+		    // restore curwin/curbuf and a few other things
+		    aucmd_restbuf(&aco);
+		}
 	    }
-	    if (bufref_valid(&old_curbuf))
-		curbuf = old_curbuf.br_buf;
 	}
     }
 
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index a16329b..70e9608 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2382,4 +2382,24 @@
   augroup! FileChangedROTest
 endfunc
 
+func LogACmd()
+  call add(g:logged, line('$'))
+endfunc
+
+func Test_TermChanged()
+  enew!
+  tabnew
+  call setline(1, ['a', 'b', 'c', 'd'])
+  $
+  au TermChanged * call LogACmd()
+  let g:logged = []
+  let term_save = &term
+  set term=xterm
+  call assert_equal([1, 4], g:logged)
+
+  au! TermChanged
+  let &term = term_save
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
index cda4a81..96ef2c1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    302,
+/**/
     301,
 /**/
     300,