diff --git a/vimrc b/vimrc
index ef13395..ae334ba 100644
--- a/vimrc
+++ b/vimrc
@@ -36,8 +36,13 @@ Plug 'mkitt/tabline.vim'
 " YouCompleteMe
 " TODO: Try out neovim completion plugins to see if they are better
 if !platform#is_windows()
-  " YouCompleteMe with parameter completion
-  Plug 'oblitum/YouCompleteMe', {'do': './install.py --clang-completer'}
+  if platform#is_linux()
+    " YouCompleteMe with parameter completion
+    Plug 'oblitum/YouCompleteMe', {'do': './install.py --clang-completer'}
+  else
+    " YouCompleteMe upstream works best on macOS
+    Plug 'Valloric/YouCompleteMe', {'do': './install.py --clang-completer'}
+  endif
   let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
   let g:ycm_key_list_previous_completion = ['<C-p>', '<Up>']
   let g:ycm_min_num_of_chars_for_completion = 1