Upstreaming from our Fedora package which ships with this file. Patches 1-4 are just cleanup to make 5/5 not hurt too much. It distchecks, which means this patchset has seen about as much testing as the last couple of releases. Cheers, Peter