Should try to do this before gnu-efi-3.0.14 is stabled (see bug 810907 for why). But let's wait a bit as we added a patch.
amd64 done
x86 stable. Closing.