diff --git a/plugin/fugitive.vim b/plugin/fugitive.vim
index a23f26a..2a01af4 100644
--- a/plugin/fugitive.vim
+++ b/plugin/fugitive.vim
@@ -137,6 +137,9 @@ function! s:Detect(path)
       call buffer.setvar('&path',s:sub(buffer.getvar('&path'),'^\.%(,|$)',''))
     endif
     if b:git_dir !~# ',' && stridx(buffer.getvar('&tags'),b:git_dir.'/tags') == -1
+      if &filetype != ''
+        call buffer.setvar('&tags',buffer.getvar('&tags').','.b:git_dir.'/'.&filetype.'.tags')
+      endif
       call buffer.setvar('&tags',buffer.getvar('&tags').','.b:git_dir.'/tags')
     endif
   endif