In case somebody finds this post in the future (like I just did): I was in the same situation as rejelepindre and managed to make it work with hydranix's instructions, with a couple of small changes:
1. Back up the contents of the EFI partition (on Linux)
2. I had to delete the old partition...