diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index e496b5b..ed2f63e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -110,9 +110,11 @@
 " Applescript
 au BufNewFile,BufRead *.scpt			setf applescript
 
+" Automake (must be before the *.am pattern)
+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
+
 " Applix ELF
-au BufNewFile,BufRead *.am
-	\ if expand("<afile>") !~? 'Makefile.am\>' | setf elf | endif
+au BufNewFile,BufRead *.am			setf elf
 
 " ALSA configuration
 au BufNewFile,BufRead .asoundrc,*/usr/share/alsa/alsa.conf,*/etc/asound.conf setf alsaconf
@@ -187,9 +189,6 @@
 " Autohotkey
 au BufNewFile,BufRead *.ahk			setf autohotkey
 
-" Automake
-au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am	setf automake
-
 " Autotest .at files are actually m4
 au BufNewFile,BufRead *.at			setf m4
 
@@ -1928,6 +1927,9 @@
 " SMITH
 au BufNewFile,BufRead *.smt,*.smith		setf smith
 
+" Smithy
+au BufNewFile,BufRead *.smithy			setf smithy
+
 " Snobol4 and spitbol
 au BufNewFile,BufRead *.sno,*.spt		setf snobol4
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index dc402dc..05ce070 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -528,6 +528,7 @@
     \ 'smarty': ['file.tpl'],
     \ 'smcl': ['file.hlp', 'file.ihlp', 'file.smcl'],
     \ 'smith': ['file.smt', 'file.smith'],
+    \ 'smithy': ['file.smithy'],
     \ 'sml': ['file.sml'],
     \ 'snobol4': ['file.sno', 'file.spt'],
     \ 'solidity': ['file.sol'],
diff --git a/src/version.c b/src/version.c
index 1876606..6a5f62d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1176,
+/**/
     1175,
 /**/
     1174,