diff --git a/doc/vim/ftdetect/zig.vim b/doc/vim/ftdetect/zig.vim
new file mode 100644
index 0000000000..983bd665fb
--- /dev/null
+++ b/doc/vim/ftdetect/zig.vim
@@ -0,0 +1 @@
+au BufRead,BufNewFile *.zig set filetype=zig
diff --git a/doc/vim/syntax/zig.vim b/doc/vim/syntax/zig.vim
new file mode 100644
index 0000000000..720a7175f0
--- /dev/null
+++ b/doc/vim/syntax/zig.vim
@@ -0,0 +1,14 @@
+" Vim syntax file
+" Language: Zig
+" Maintainer: Andrew Kelley
+" Latest Revision: 24 November 2015
+
+if exists("b:current_syntax")
+  finish
+endif
+
+syn keyword zigKeyword fn return mut const extern unreachable
+
+let b:current_syntax = "zig"
+
+hi def link zigKeyword Keyword