diff --git a/.gitmodules b/.gitmodules
index 4e7850c3..4db2716c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -95,9 +95,6 @@
 	path = lib/linux/clipmenu
   url = https://github.com/cdown/clipmenu/
   branch = develop
-[submodule "lib/vim/neomake"]
-	path = lib/vim/neomake
-	url = https://github.com/neomake/neomake
 [submodule "lib/vim/yang.vim"]
 	path = lib/vim/yang.vim
 	url = https://github.com/nathanalderson/yang.vim
@@ -119,3 +116,6 @@
 [submodule "lib/vim/vim-polyglot"]
 	path = lib/vim/vim-polyglot
 	url = https://github.com/sheerun/vim-polyglot
+[submodule "lib/vim/syntastic"]
+	path = lib/vim/syntastic
+	url = https://github.com/vim-syntastic/syntastic
diff --git a/README.md b/README.md
index 03f2a96b..977fd06a 100644
--- a/README.md
+++ b/README.md
@@ -114,8 +114,8 @@ git clone https://github.com/ervandew/supertab.git $DOTHOME/usr/vim/supertab
  * [deoplete.nvim](https://github.com/Shougo/deoplete.nvim): 🌠 Dark powered asynchronous completion framework for neovim
  * [editorconfig-vim](https://github.com/editorconfig/editorconfig-vim): EditorConfig plugin for Vim
  * [fzf.vim](https://github.com/junegunn/fzf.vim): fzf :heart: vim
- * [neomake](https://github.com/neomake/neomake): Asynchronous linting and make framework for Neovim/Vim
  * [pathogen.vim](https://github.com/tpope/vim-pathogen): Manage your runtimepath
+ * [syntastic](https://github.com/scrooloose/syntastic): Syntax checking hacks for vim
  * [tsuquyomi](https://github.com/Quramy/tsuquyomi): A Vim plugin for TypeScript
  * [ultisnips](https://github.com/SirVer/ultisnips): The ultimate snippet solution for Vim
  * [vim-commentary](https://github.com/tpope/vim-commentary): comment stuff out
diff --git a/config/vimrc b/config/vimrc
index 1856d800..0c59bef5 100644
--- a/config/vimrc
+++ b/config/vimrc
@@ -388,10 +388,6 @@
     call deoplete#enable()
   endif
 
-  " Set patterns for TypeScript autocompletion
-  let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
-  let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*']
-
   " Fugitive
   autocmd VimRc BufReadPost fugitive://* set bufhidden=delete
   nnoremap <silent> <leader>gs :Gstatus<CR>
@@ -403,11 +399,19 @@
   nnoremap <silent> <leader>gw :Gwrite<CR>
   nnoremap <silent> <leader>gr :Gremove<CR>
 
-  " Neomake
+  " Syntastic
   nmap <silent> <leader>mf :Neomake<CR>
-  nmap <silent> <leader>mF :Neomake!<CR>
-  set statusline+=\ %#ErrorMsg#%{neomake#statusline#LoclistStatus('loc:\ ')}
-  set statusline+=\ %#ErrorMsg#%{neomake#statusline#QflistStatus('qf:\ ')}
+  nmap <silent> <leader>mF :make<CR>
+  let g:syntastic_always_populate_loc_list = 1
+  let g:syntastic_vim_checkers = ['vint']
+  let g:syntastic_html_checkers = ['htmlhint']
+  set statusline+=%#warningmsg#%{SyntasticStatuslineFlag()}%*
+
+  " TypeScript
+  let g:deoplete#omni#input_patterns = get(g:,'deoplete#omni#input_patterns',{})
+  let g:deoplete#omni#input_patterns.typescript = ['[^. \t0-9]\.\w*']
+  let g:tsuquyomi_disable_quickfix = 1
+  let g:syntastic_typescript_checkers = ['tsuquyomi']
 
   " Vim Test
   let test#strategy = 'make'
@@ -486,19 +490,11 @@
 " }}}
 
 " User configuration {{{
+"
   try
     " Load user configuration
     source $DOTHOME/usr/vimrc
   catch
   endtry
 
-  " Yang
-  let g:neomake_yang_enabled_makers = [ 'pyang' ]
-  let g:neomake_yang_pyang_maker = {
-        \ 'args': [ '--path', get(g:, 'neomake_yang_pyang_yangpath', '.') ],
-        \ 'errorformat':
-        \ '%f:%l: %trror: %m,' .
-        \ '%f:%l: %tarning: %m,'
-        \ }
-
 " }}}
diff --git a/lib/vim/neomake b/lib/vim/neomake
deleted file mode 160000
index ff4cf32b..00000000
--- a/lib/vim/neomake
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff4cf32b74e067cc50abce7bdb6215bb3b969f26
diff --git a/lib/vim/syntastic b/lib/vim/syntastic
new file mode 160000
index 00000000..2124af80
--- /dev/null
+++ b/lib/vim/syntastic
@@ -0,0 +1 @@
+Subproject commit 2124af80abfb856e8806c3b508b3982b7157c4a3