diff --git a/misc/vim/README.md b/misc/vim/README.md
new file mode 100644
index 000000000000..bd6a3f33cf94
--- /dev/null
+++ b/misc/vim/README.md
@@ -0,0 +1,3 @@
+# QL syntax highlighting and file-type detection for Vim
+
+To install, copy the `syntax` and `ftdetect` directories to `~/.vim`.
diff --git a/misc/vim/ftdetect/ql.vim b/misc/vim/ftdetect/ql.vim
new file mode 100644
index 000000000000..e4216dfbf555
--- /dev/null
+++ b/misc/vim/ftdetect/ql.vim
@@ -0,0 +1,4 @@
+
+au BufRead,BufNewFile *.ql  setfiletype ql
+au BufRead,BufNewFile *.qll setfiletype ql
+
diff --git a/misc/vim/syntax/ql.vim b/misc/vim/syntax/ql.vim
new file mode 100644
index 000000000000..56e6f09d2f23
--- /dev/null
+++ b/misc/vim/syntax/ql.vim
@@ -0,0 +1,42 @@
+syn keyword qlKeyword       from where select predicate in as order by asc desc module result this super
+syn keyword qlAnnotation    abstract cached external final library noopt private deprecated override query pragma language bindingset noinline nomagic monotonicAggregates
+syn keyword qlLogic         not and or implies exists forall forex any none
+syn keyword qlConditional   if then else
+syn keyword qlType          int float string boolean date
+syn keyword qlImport        import nextgroup=qlQualified skipwhite
+syn keyword qlTypeMod       class extends instanceof nextgroup=qlType skipwhite
+syn keyword qlAggregate     avg concat count max min rank strictconcat strictcount strictsum sum
+syn keyword qlConstant      false true
+
+syn match  qlQualified     "\v([a-zA-Z_]+\.)*[a-zA-Z_]+"
+syn match  qlComment       "//.*$" contains=@Spell
+syn match  qlComparison    "[!=<>]"
+syn match  qlVar           "\v[a-zA-Z0-9_#]+"
+syn match  qlType          "\v[@A-Z][a-zA-Z0-9_]+"
+syn match  qlPredicate     "\v[a-zA-Z0-9_#@]+\ze\("
+syn match  qlInt           "\d\+"
+syn match  qlFloat         "\d\+\.\d\+"
+
+syn region qlComment      start="/\*" end="\*/" contains=@Spell
+syn region qlString       start=/\v"/ skip=/\v\\./ end=/\v"/
+
+hi def link qlComment     Comment
+hi def link qlString      String
+hi def link qlImport      Include
+hi def link qlComparison  Operator
+hi def link qlAnnotation  PreProc
+hi def link qlTypeMod     Keyword
+hi def link qlLogic       Keyword
+hi def link qlAggregate   Keyword
+hi def link qlPredicate   Function
+hi def link qlConditional Conditional
+hi def link qlType        Type
+hi def link qlConstant    Constant
+hi def link qlInt         Number
+hi def link qlFloat       Float
+if !exists("g:qlVarNoHighlight")
+  hi def link qlVar         Identifier
+endif
+hi def link qlKeyword     Keyword
+hi def link qlQualified   Normal
+