Update to support gnupg2