diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 22f6d1c41e..e496b5beb2 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1897,6 +1897,9 @@ au BufNewFile,BufRead *.il,*.ils,*.cdf		setf skill
 au BufNewFile,BufRead .slrnrc			setf slrnrc
 au BufNewFile,BufRead *.score			setf slrnsc
 
+" Smali
+au BufNewFile,BufRead *.smali			setf smali
+
 " Smalltalk
 au BufNewFile,BufRead *.st			setf st
 
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 9dfb1a4920..dc402dc6e1 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -524,6 +524,7 @@ let s:filename_checks = {
     \ 'slrnrc': ['.slrnrc'],
     \ 'slrnsc': ['file.score'],
     \ 'sm': ['sendmail.cf'],
+    \ 'smali': ['file.smali'],
     \ 'smarty': ['file.tpl'],
     \ 'smcl': ['file.hlp', 'file.ihlp', 'file.smcl'],
     \ 'smith': ['file.smt', 'file.smith'],
diff --git a/src/version.c b/src/version.c
index ebe699f44e..47ef860804 100644
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1174,
 /**/
     1173,
 /**/