diff --git a/Ezmlm/trunk/GpgEzmlm.pm b/Ezmlm/trunk/Ezmlm/GpgEzmlm.pm
similarity index 100%
rename from Ezmlm/trunk/GpgEzmlm.pm
rename to Ezmlm/trunk/Ezmlm/GpgEzmlm.pm
diff --git a/Ezmlm/trunk/GpgKeyRing.pm b/Ezmlm/trunk/Ezmlm/GpgKeyRing.pm
similarity index 97%
rename from Ezmlm/trunk/GpgKeyRing.pm
rename to Ezmlm/trunk/Ezmlm/GpgKeyRing.pm
index 38e6dee..99ff26a 100644
--- a/Ezmlm/trunk/GpgKeyRing.pm
+++ b/Ezmlm/trunk/Ezmlm/GpgKeyRing.pm
@@ -58,21 +58,17 @@ $GPG_BIN = '/usr/bin/gpg';	# Autoinserted by Makefile.PL
 
 # == check the gpg path ==
 $GPG_BIN = '/usr/local/bin/gpg'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 $GPG_BIN = '/usr/bin/gpg'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 $GPG_BIN = '/bin/gpg'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 $GPG_BIN = '/usr/local/bin/gpg2'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 $GPG_BIN = '/usr/bin/gpg2'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 $GPG_BIN = '/bin/gpg2'
-	unless (-e "$GPG_BIN");
-$GPG_BIN = '/usr/local/bin/gpg'
-	unless (-e "$GPG_BIN");
-$GPG_BIN = '/bin/gpg'
-	unless (-e "$GPG_BIN");
+	unless (-x "$GPG_BIN");
 
 # == clean up the path ==
 local $ENV{'PATH'} = "/bin";
diff --git a/Ezmlm/trunk/MANIFEST b/Ezmlm/trunk/MANIFEST
index 8bcd77d..3bd323b 100644
--- a/Ezmlm/trunk/MANIFEST
+++ b/Ezmlm/trunk/MANIFEST
@@ -5,3 +5,5 @@ README
 Makefile.PL
 test.pl
 META.yml
+Ezmlm/GpgKeyRing.pm
+Ezmlm/GpgEzmlm.pm