diff --git a/utils/emacs/llvm-mode.el b/utils/emacs/llvm-mode.el
index 477f821ded9..b26a4cab27d 100644
--- a/utils/emacs/llvm-mode.el
+++ b/utils/emacs/llvm-mode.el
@@ -33,7 +33,7 @@
    ;; Special instructions
    '("phi\\|call\\|cast\\|to\\|shl\\|shr\\|vaarg\\|vanext" . font-lock-keyword-face)
    ;; Control instructions
-   '("ret\\|br\\|switch\\|invoke" . font-lock-keyword-face)
+   '("ret\\|br\\|switch\\|invoke\\|unwind" . font-lock-keyword-face)
    ;; Memory operators
    '("malloc\\|alloca\\|free\\|load\\|store\\|getelementptr" . font-lock-keyword-face)
    )
diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim
index 7b426f4ac59..e25dbdbe3e2 100644
--- a/utils/vim/llvm.vim
+++ b/utils/vim/llvm.vim
@@ -21,7 +21,7 @@ syn keyword llvmStatement and or xor
 syn keyword llvmStatement setne seteq setlt setgt setle setge
 
 syn keyword llvmStatement phi call cast to shl shr vaarg vanext
-syn keyword llvmStatement ret br switch invoke
+syn keyword llvmStatement ret br switch invoke unwind
 syn keyword llvmStatement malloc alloca free load store getelementptr
 
 syn keyword llvmStatement begin end true false