diff --git a/.vim/after/ftplugin/perl.vim b/.vim/after/ftplugin/perl.vim
index 741a815..7e93e0d 100644
--- a/.vim/after/ftplugin/perl.vim
+++ b/.vim/after/ftplugin/perl.vim
@@ -4,7 +4,7 @@ setlocal equalprg=perltidy\ -q
 let &l:path = './lib,./blib/lib,./blib/arch,' . &l:path
 let $PERL5LIB = substitute(&l:path, ',', ':', 'g')
 
-setlocal keywordprg=perlfind
+setlocal keywordprg=cpandoc
 if has('mac')
     " groff bug converts some characters to utf-8.
     let b:keywordprg = "PERLDOC='-n\"nroff -Tascii\"' " . &keywordprg
diff --git a/.vimrc b/.vimrc
index 2b7007f..c0b4e8c 100644
--- a/.vimrc
+++ b/.vimrc
@@ -370,14 +370,17 @@ let g:gist_post_private = 1
 let g:gist_detect_filetype = 1
 
 let g:ref_cache_dir = expand('~/.vim/tmp/cache', 1)
-let g:ref_perldoc_cmd = 'perlfind'
+let g:ref_perldoc_cmd = 'cpandoc'
 let g:ref_perldoc_auto_append_f = 1
 
 let g:cpan_mod_cachef = expand('~/.vim/tmp/cache/cpan-modules.txt', 1)
 
+if ! exists('g:airline_symbols')
+    let g:airline_symbols = {}
+endif
+let g:airline_symbols.branch = "\u2387 "
 let g:airline_left_sep = "\u25b6"
 let g:airline_right_sep = "\u25c0"
-let g:airline_branch_prefix = "\u2387 "
 let g:airline_section_z = '%l/%L : %c (%p%%)'
 let g:airline#extensions#whitespace#enabled = 0
 let g:airline#extensions#tabline#enabled = 1