diff --git a/cranelift/README.md b/cranelift/README.md
index b0e37978f9..b2fda81b5b 100644
--- a/cranelift/README.md
+++ b/cranelift/README.md
@@ -158,3 +158,10 @@ generator](http://www.sphinx-doc.org/) as well as Python 3::
     $ open _build/html/index.html
 
 </details>
+
+Editor Support
+--------------
+
+Editor support for working with Cranelift IR (clif) files:
+
+ - Vim: https://github.com/CraneStation/cranelift.vim
diff --git a/misc/vim/ftdetect/clif.vim b/misc/vim/ftdetect/clif.vim
deleted file mode 100644
index 58312284a1..0000000000
--- a/misc/vim/ftdetect/clif.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.clif set filetype=clif
diff --git a/misc/vim/syntax/clif.vim b/misc/vim/syntax/clif.vim
deleted file mode 100644
index 337e3a78a7..0000000000
--- a/misc/vim/syntax/clif.vim
+++ /dev/null
@@ -1,43 +0,0 @@
-" Vim syntax file
-" Language:     Cranelift
-" Maintainer:   The Cranelift Project Developers
-
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
-  finish
-endif
-
-" Disable spell checking even in comments.
-" They tend to refer to weird stuff like assembler mnemonics anyway.
-syn spell notoplevel
-
-syn keyword clifHeader test target set
-syn keyword clifDecl function jump_table incoming_arg outgoing_arg spill_slot explicit_slot emergency_slot
-syn keyword clifFilecheck check sameln nextln unordered not regex contained
-
-syn match clifType  /\<\([bif]\d\+\(x\d\+\)\?\)\|[if]flags\>/
-syn match clifEntity /\<\(v\|ss\|jt\|fn\|sig\)\d\+\>/
-syn match clifLabel /\<ebb\d+\>/
-syn match clifName /%\w\+\>/
-
-syn match clifNumber /-\?\<[0-9_]\+\>/
-syn match clifNumber /-\?\<0x[0-9a-fA-F_]\+\(\.[0-9a-fA-F_]*\)\?\(p[+-]\?\d\+\)\?\>/
-syn match clifHexSeq /#\x\+\>/
-syn match clifSourceLoc /@[0-9a-f]\+\>/
-
-syn region clifCommentLine start=";" end="$" contains=clifFilecheck
-
-hi def link clifHeader        Keyword
-hi def link clifDecl          Keyword
-hi def link clifType          Type
-hi def link clifEntity        Identifier
-hi def link clifLabel         Label
-hi def link clifName          String
-hi def link clifNumber        Number
-hi def link clifHexSeq        Number
-hi def link clifCommentLine   Comment
-hi def link clifFilecheck     SpecialComment
-hi def link clifSourceLoc     LineNr
-
-let b:current_syntax = "clif"