diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c1a57cf373e..771f2211606 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2014-10-20  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* epg-config.el (epg-gpg-program): Don't use the absolute names by default.
+
 	* emacs-lisp/bytecomp.el (=, <, >, <=, >=): Don't optimize multi-arg
 	case (bug#18767).
 
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 10b37041443..16ed6e1f5c9 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -39,9 +39,9 @@
   :group 'data
   :group 'external)
 
-(defcustom epg-gpg-program (or (executable-find "gpg")
-			       (executable-find "gpg2")
-			       "gpg")
+(defcustom epg-gpg-program (cond ((executable-find "gpg") "gpg")
+				 ((executable-find "gpg2") "gpg2")
+				 (t "gpg"))
   "The `gpg' executable."
   :group 'epg
   :type 'string)