merge changes from AUR package for entrance-git-manjaro