diff --git a/custom/plugins/yocto/yocto.plugin.zsh b/custom/plugins/yocto/yocto.plugin.zsh
new file mode 100644
index 000000000..200eb4c98
--- /dev/null
+++ b/custom/plugins/yocto/yocto.plugin.zsh
@@ -0,0 +1,4 @@
+# Fake bash for build system
+autoload -U +X bashcompinit && bashcompinit
+
+alias bb='bitbake'
diff --git a/templates/zshrc-linux.zsh b/templates/zshrc-linux.zsh
index d1a229a3e..b75027a9a 100644
--- a/templates/zshrc-linux.zsh
+++ b/templates/zshrc-linux.zsh
@@ -39,7 +39,7 @@ plugins=(git2 python repo intel-repo cp buildbot rsync git-extras git-remote-bra
          command-not-found debian dircycle encode64 lol extract launch_trial \
          vim-scp ufw sublime pylint pep8 autopep8 \
          common-aliases buildbot_dev zsh-syntax-highlighting \
-         txw jump grin pip colored-man docker)
+         tmux txw jump grin pip colored-man docker yocto)
 
 source $ZSH/oh-my-zsh.sh