An earlier diff got tested by landry@. Thanks!
From Daniel Dickman. Thanks!
Joint work with uwe@ and grunk@. ok matthieu@ (MAINTAINER)