diff --git a/vim/vim.symlink/bundle/syntastic/plugin/syntastic/highlighting.vim b/vim/vim.symlink/bundle/syntastic/plugin/syntastic/highlighting.vim
index 183228c..d7cb7f5 100644
--- a/vim/vim.symlink/bundle/syntastic/plugin/syntastic/highlighting.vim
+++ b/vim/vim.symlink/bundle/syntastic/plugin/syntastic/highlighting.vim
@@ -39,9 +39,10 @@ function! g:SyntasticHighlightingNotifier.refresh(loclist) " {{{2
         for item in issues
             let group = 'Syntastic' . get(item, 'subtype', '') . ( item['type'] ==? 'E' ? 'Error' : 'Warning' )
 
+            call matchaddpos(group . 'Line', [item['lnum']])
+
             " The function `Syntastic_{filetype}_{checker}_GetHighlightRegex` is
             " used to override default highlighting.
-            call matchaddpos(group . 'Line', [item['lnum']])
             if has_key(item, 'hl')
                 call matchadd(group, '\%' . item['lnum'] . 'l' . item['hl'])
             elseif get(item, 'col', 0)
diff --git a/vim/vim.symlink/bundle/syntastic/plugin/syntastic/signs.vim b/vim/vim.symlink/bundle/syntastic/plugin/syntastic/signs.vim
index a8bb393..9d16949 100644
--- a/vim/vim.symlink/bundle/syntastic/plugin/syntastic/signs.vim
+++ b/vim/vim.symlink/bundle/syntastic/plugin/syntastic/signs.vim
@@ -103,10 +103,12 @@ function! g:SyntasticSignsNotifier._signErrors(loclist) " {{{2
             if i['lnum'] > 0 && !has_key(seen, i['lnum'])
                 let seen[i['lnum']] = 1
 
-                let severity = i['type'] ==? 'W' ? 'Warning' : 'Error'
-                let type = 'Syntastic' . severity
+                let sign_severity = i['type'] ==? 'W' ? 'Warning' : 'Error'
+                let sign_subtype = get(i, 'subtype', '')
+                let sign_type = 'Syntastic' . sign_subtype . sign_severity
 
-                call matchaddpos(type, [i['lnum']], 400000)
+                execute "sign place " . s:next_sign_id . " line=" . i['lnum'] . " name=" . sign_type . " buffer=" . i['bufnr']
+                call add(self._bufSignIds(), s:next_sign_id)
                 let s:next_sign_id += 1
             endif
         endfor