More gpg2 compatibility :-(