I've merged a patch Paul Stewart sent me some time ago, which should make life
easier for the guys writing UPS daemons.