diff --git a/contrib/vim/ftplugin/bitbake.vim b/contrib/vim/ftplugin/bitbake.vim
index 9e8d3e13ce..a23abe573a 100644
--- a/contrib/vim/ftplugin/bitbake.vim
+++ b/contrib/vim/ftplugin/bitbake.vim
@@ -6,8 +6,11 @@ endif
 " Don't load another plugin for this buffer
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl cms< sts< sw< et< sua<"
+let b:undo_ftplugin = "setl inc< pa< cms< sts< sw< et< sua<"
 
+setlocal include=^\s*\(inherit\|include\|require\)
+" Yocto, Petalinux
+setlocal path=.,,meta/classes*,components/yocto/layers/**/classes*
 setlocal commentstring=#\ %s
 setlocal softtabstop=4 shiftwidth=4 expandtab
 setlocal suffixesadd+=.bb,.bbclass