diff --git a/README.md b/README.md
index 68f9e62627..524d0235c7 100644
--- a/README.md
+++ b/README.md
@@ -151,3 +151,8 @@ To fix this, you have 2 options:
 
  * Compile Zig with the same compiler that LLVM was compiled with.
  * Add `-DZIG_LLVM_OLD_CXX_ABI=yes` to the cmake configure line.
+
+### Related Projects
+
+ * [zig-mode](https://github.com/AndreaOrru/zig-mode) - Emacs integration
+ * [zig.vim](https://github.com/andrewrk/zig.vim) - Vim configuration files
diff --git a/doc/emacs/README.md b/doc/emacs/README.md
deleted file mode 100644
index 3e8ff6f04d..0000000000
--- a/doc/emacs/README.md
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/AndreaOrru/zig-mode
diff --git a/doc/vim/ftdetect/zig.vim b/doc/vim/ftdetect/zig.vim
deleted file mode 100644
index 983bd665fb..0000000000
--- a/doc/vim/ftdetect/zig.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufRead,BufNewFile *.zig set filetype=zig
diff --git a/doc/vim/ftplugin/zig.vim b/doc/vim/ftplugin/zig.vim
deleted file mode 100644
index ab0fc4607c..0000000000
--- a/doc/vim/ftplugin/zig.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set expandtab
-set tabstop=4
-set shiftwidth=4
diff --git a/doc/vim/syntax/zig.vim b/doc/vim/syntax/zig.vim
deleted file mode 100644
index 05904a7adf..0000000000
--- a/doc/vim/syntax/zig.vim
+++ /dev/null
@@ -1,81 +0,0 @@
-" Vim syntax file
-" Language: Zig
-" Maintainer: Andrew Kelley
-" Latest Revision: 03 August 2016
-
-if exists("b:current_syntax")
-  finish
-endif
-let b:current_syntax = "zig"
-
-syn keyword zigStorage const var extern packed export pub noalias inline comptime nakedcc coldcc volatile
-syn keyword zigStructure struct enum union
-syn keyword zigStatement goto break return continue asm defer unreachable
-syn keyword zigConditional if else switch try and or
-syn keyword zigRepeat while for
-
-syn keyword zigConstant null undefined this
-syn keyword zigKeyword fn use test
-syn keyword zigType bool f32 f64 void noreturn type error
-syn keyword zigType i8  u8  i16  u16  i32  u32  i64  u64  isize  usize
-syn keyword zigType c_short c_ushort c_int c_uint c_long c_ulong c_longlong c_ulonglong c_long_double
-
-syn keyword zigBoolean true false
-
-syn match zigOperator display "\%(+%\?\|-%\?\|/\|*%\?\|=\|\^\|&\|?\||\|!\|>\|<\|%\|<<%\?\|>>\)=\?"
-syn match zigArrowCharacter display "->"
-
-syn match zigDecNumber display "\<[0-9]\+\%(.[0-9]\+\)\=\%([eE][+-]\?[0-9]\+\)\="
-syn match zigHexNumber display "\<0x[a-fA-F0-9]\+\%(.[a-fA-F0-9]\+\%([pP][+-]\?[0-9]\+\)\?\)\="
-syn match zigOctNumber display "\<0o[0-7]\+"
-syn match zigBinNumber display "\<0b[01]\+\%(.[01]\+\%([eE][+-]\?[0-9]\+\)\?\)\="
-
-
-syn match zigCharacterInvalid display contained /b\?'\zs[\n\r\t']\ze'/
-syn match zigCharacterInvalidUnicode display contained /b'\zs[^[:cntrl:][:graph:][:alnum:][:space:]]\ze'/
-syn match zigCharacter /b'\([^\\]\|\\\(.\|x\x\{2}\)\)'/ contains=zigEscape,zigEscapeError,zigCharacterInvalid,zigCharacterInvalidUnicode
-syn match zigCharacter /'\([^\\]\|\\\(.\|x\x\{2}\|u\x\{4}\|U\x\{6}\)\)'/ contains=zigEscape,zigEscapeUnicode,zigEscapeError,zigCharacterInvalid
-
-syn region zigCommentLine start="//" end="$" contains=zigTodo,@Spell
-syn region zigCommentLineDoc start="//\%(//\@!\|!\)" end="$" contains=zigTodo,@Spell
-
-" TODO match only the first '\\' within the zigMultilineString as zigMultilineStringPrefix
-syn match zigMultilineStringPrefix display contained /c\?\\\\/
-syn region zigMultilineString start="c\?\\\\" end="$" contains=zigMultilineStringPrefix
-
-syn keyword zigTodo contained TODO XXX
-
-syn match     zigEscapeError   display contained /\\./
-syn match     zigEscape        display contained /\\\([nrt\\'"]\|x\x\{2}\)/
-syn match     zigEscapeUnicode display contained /\\\(u\x\{4}\|U\x\{6}\)/
-syn region    zigString      start=+c\?"+ skip=+\\\\\|\\"+ end=+"+ oneline contains=zigEscape,zigEscapeUnicode,zigEscapeError,@Spell
-
-hi def link zigDecNumber zigNumber
-hi def link zigHexNumber zigNumber
-hi def link zigOctNumber zigNumber
-hi def link zigBinNumber zigNumber
-
-hi def link zigKeyword Keyword
-hi def link zigType Type
-hi def link zigCommentLine Comment
-hi def link zigCommentLineDoc SpecialComment
-hi def link zigTodo Todo
-hi def link zigString String
-hi def link zigMultilineString String
-hi def link zigMultilineStringPrefix Comment
-hi def link zigCharacterInvalid Error
-hi def link zigCharacterInvalidUnicode zigCharacterInvalid
-hi def link zigCharacter Character
-hi def link zigEscape Special
-hi def link zigEscapeUnicode zigEscape
-hi def link zigEscapeError Error
-hi def link zigBoolean Boolean
-hi def link zigConstant Constant
-hi def link zigNumber Number
-hi def link zigArrowCharacter zigOperator
-hi def link zigOperator Operator
-hi def link zigStorage StorageClass
-hi def link zigStructure Structure
-hi def link zigStatement Statement
-hi def link zigConditional Conditional
-hi def link zigRepeat Repeat