diff --git a/editors/vim/autoload/plug.vim b/editors/vim/autoload/plug.vim
index 4e05630..2c26070 100644
--- a/editors/vim/autoload/plug.vim
+++ b/editors/vim/autoload/plug.vim
@@ -434,8 +434,8 @@ endfunction
 
 function! s:dobufread(names)
   for name in a:names
-    let path = s:rtp(g:plugs[name]).'/**'
-    for dir in ['ftdetect', 'ftplugin']
+    let path = s:rtp(g:plugs[name])
+    for dir in ['ftdetect', 'ftplugin', 'after/ftdetect', 'after/ftplugin']
       if len(finddir(dir, path))
         if exists('#BufRead')
           doautocmd BufRead
@@ -2224,7 +2224,7 @@ function! s:upgrade()
   let new = tmp . '/plug.vim'
 
   try
-    let out = s:system(printf('git clone --depth 1 %s %s', s:plug_src, tmp))
+    let out = s:system(printf('git clone --depth 1 %s %s', s:shellesc(s:plug_src), s:shellesc(tmp)))
     if v:shell_error
       return s:err('Error upgrading vim-plug: '. out)
     endif