diff --git a/llvm/utils/vim/vimrc b/llvm/utils/vim/vimrc
index 1b2de0f7f2c9..7b1fd872b274 100644
--- a/llvm/utils/vim/vimrc
+++ b/llvm/utils/vim/vimrc
@@ -58,3 +58,15 @@ command! DeleteTrailingWs :%s/\s\+$//
 
 " Convert all tab characters to two spaces
 command! Untab :%s/\t/  /g
+
+" Enable syntax highlighting for LLVM files. To use, copy
+" utils/vim/llvm.vim to ~/.vim/syntax .
+augroup filetype
+  au! BufRead,BufNewFile *.ll     set filetype=llvm
+augroup END
+
+" Enable syntax highlighting for tablegen files. To use, copy
+" utils/vim/tablegen.vim to ~/.vim/syntax .
+augroup filetype
+  au! BufRead,BufNewFile *.td     set filetype=tablegen
+augroup END