Bug#1024840: updated patch

[Gábor Németh]

Yes, I have noticed the fix and included something along these lines, in
a batch of changes now awaiting sponsor review.
Thanks,
Gábor