diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index dcb6130b32..6904a18c10 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2646,7 +2646,7 @@ au BufNewFile,BufRead *.toml			setf toml
 au BufNewFile,BufRead *.tpp			setf tpp
 
 " TRACE32 Script Language
-au BufNewFile,BufRead *.cmm,*.t32		setf trace32
+au BufNewFile,BufRead *.cmm,*.cmmt,*.t32	setf trace32
 
 " Treetop
 au BufRead,BufNewFile *.treetop			setf treetop
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 3dcc665290..3125ffc99a 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -816,7 +816,7 @@ def s:GetFilenameChecks(): dict<list<string>>
     tmux: ['tmuxfile.conf', '.tmuxfile.conf', '.tmux-file.conf', '.tmux.conf', 'tmux-file.conf', 'tmux.conf', 'tmux.conf.local'],
     toml: ['file.toml', 'Gopkg.lock', 'Pipfile', '/home/user/.cargo/config', '.black'],
     tpp: ['file.tpp'],
-    trace32: ['file.cmm', 'file.t32'],
+    trace32: ['file.cmm', 'file.cmmt', 'file.t32'],
     treetop: ['file.treetop'],
     trig: ['file.trig'],
     trustees: ['trustees.conf'],
diff --git a/src/version.c b/src/version.c
index cb4805a2fa..20eafbbe4f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1085,
 /**/
     1084,
 /**/