diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 0693cba..89a30a8 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -2234,6 +2234,9 @@
 " TPP - Text Presentation Program
 au BufNewFile,BufRead *.tpp			setf tpp
 
+" TRACE32 Script Language
+au BufNewFile,BufRead *.cmm,*.t32		setf t32
+
 " Treetop
 au BufRead,BufNewFile *.treetop			setf treetop
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 2e5d982..d5e0038 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -662,6 +662,7 @@
               'any/etc/systemd/system/file.d/.#-file',
               'any/etc/systemd/system/file.d/file.conf'],
     systemverilog: ['file.sv', 'file.svh'],
+    t32: ['file.cmm', 'file.t32'],
     tags: ['tags'],
     tak: ['file.tak'],
     tal: ['file.tal'],
diff --git a/src/version.c b/src/version.c
index a3fc959..13888eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1618,
+/**/
     1617,
 /**/
     1616,