I have prepared an updated patch which covers grub and grub2 also; just testing now before I upload it.