Pádraig,

I replaced --suffix with --additional-suffix and made some cleaning.

Feel free to comment the attached patch.

Cheers,

Jérémy