-(defcustom epa-file-name-regexp "\\.gpg\\'"
- "Regexp which matches filenames to be encrypted with GnuPG."
+(defun epa-file--file-name-regexp-set (variable value)
+ (set-default variable value)
+ (if (fboundp 'epa-file-name-regexp-update)
+ (epa-file-name-regexp-update)))
+
+(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'"
+ "Regexp which matches filenames to be encrypted with GnuPG.
+
+If you set this outside Custom while epa-file is already enabled, you
+have to call `epa-file-name-regexp-update' after setting it to
+properly update file-name-handler-alist. Setting this through Custom
+does that automatically."