This patch has been kicking around in the Debian tree for quite some time.

It would be wonderful to be able to drop the fork.

lamont