diff --git a/ftdetect/maude.vim b/ftdetect/maude.vim
new file mode 100644
index 0000000..cea0a3b
--- /dev/null
+++ b/ftdetect/maude.vim
@@ -0,0 +1,2 @@
+au BufNewFile,BufRead *.maude set filetype=maude
+au BufNewFile,BufRead *.fm set filetype=maude
diff --git a/syntax/maude.vim b/syntax/maude.vim
index c794631..6d5eea7 100644
--- a/syntax/maude.vim
+++ b/syntax/maude.vim
@@ -15,7 +15,7 @@ command! -nargs=+ MaudeHiLink hi def link <args>
 
 syn keyword maudeModule     mod fmod omod endm endfm endm is
 syn keyword maudeImports    protecting including extending
-syn keyword maudeSorts      sorts subsorts
+syn keyword maudeSorts      sort sorts subsort subsorts
 syn keyword maudeStatements op ops var vars eq ceq
 syn match   maudeFlags      "\[.*\]"
 syn keyword maudeCommands   reduce
@@ -76,7 +76,7 @@ syn match   maudeSorts      "MatchPair\?"
 syn match   maudeSorts      "Substitution\?"
 
 " From the BOOL module
-syn keyword maudeStatements and or xor not implies
+syn keyword maudeStatements if and or xor not implies
 
 syn keyword maudeLiteral    true false
 syn match   maudeLiteral    "\<\(0[0-7]*\|0[xX]\x\+\|\d\+\)[lL]\=\>"