diff --git a/plugin/autoload_cscope.vim b/plugin/autoload_cscope.vim
index 6e8d96d..72ea705 100644
--- a/plugin/autoload_cscope.vim
+++ b/plugin/autoload_cscope.vim
@@ -176,8 +176,12 @@ augroup autoload_cscope
  au!
  au BufEnter *.[chly]  call <SID>Cycle_csdb() | call <SID>Cycle_macros_menus()
  au BufEnter *.cc      call <SID>Cycle_csdb() | call <SID>Cycle_macros_menus()
+ au BufEnter *.cpp     call <SID>Cycle_csdb() | call <SID>Cycle_macros_menus()
+ au BufEnter *.go      call <SID>Cycle_csdb() | call <SID>Cycle_macros_menus()
  au BufUnload *.[chly] call <SID>Unload_csdb() | call <SID>Cycle_macros_menus()
  au BufUnload *.cc     call <SID>Unload_csdb() | call <SID>Cycle_macros_menus()
+ au BufUnload *.cpp    call <SID>Unload_csdb() | call <SID>Cycle_macros_menus()
+ au BufUnload *.go     call <SID>Unload_csdb() | call <SID>Cycle_macros_menus()
 augroup END
 
 let &cpo = s:save_cpo