Apply Simon Josefsson <jas@pdc.kth.se>'s patch.