See the latest patch: https://bugzilla.mindrot.org/attachment.cgi?id=2872&action=diff Any hope this could be added to Debian custom patches in the next release?