Hi Sune,judging from the lack of negative comments on the thread ;-) , it seems that option 1 is the way to go.
As this is a release-critical bug, do you think you could upload a fix so we can mark the bug as closed?
If there's any way we can help, just let us know. Kind Regards,Stefan Baur (speaking as part of the Debian Bug Squashing Party taking place at the Linuxhotel, Essen, Germany this weekend)