Bring in features from pgp-utils