diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fe2e94e..6da5046 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -10864,7 +10864,7 @@
 
 win_gettype([{nr}])					*win_gettype()*
 		Return the type of the window:
-			"aucmdwin"	autocommand window. Temporary window
+			"autocmd"	autocommand window. Temporary window
 					used to execute autocommands.
 			"popup"		popup window |popup|
 			"preview"	preview window |preview-window|
diff --git a/src/evalwindow.c b/src/evalwindow.c
index 585ff72..0b3052c 100644
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -859,7 +859,7 @@
 	}
     }
     if (wp == aucmd_win)
-	rettv->vval.v_string = vim_strsave((char_u *)"aucmdwin");
+	rettv->vval.v_string = vim_strsave((char_u *)"autocmd");
 #if defined(FEAT_QUICKFIX)
     else if (wp->w_p_pvw)
 	rettv->vval.v_string = vim_strsave((char_u *)"preview");
diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index 285d994..e8f513a 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -2592,7 +2592,7 @@
   augroup END
 
   doautoall BufEnter
-  call assert_equal([['one.txt', 'aucmdwin'], ['two.txt', '']], g:blist)
+  call assert_equal([['one.txt', 'autocmd'], ['two.txt', '']], g:blist)
 
   augroup aucmd_win_test
     au!
diff --git a/src/version.c b/src/version.c
index 509ef22..f46bb47 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    996,
+/**/
     995,
 /**/
     994,