3 files changed, 5 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ad8edc65b34..685be52cf06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,11 @@
 2008-05-08  Eli Zaretskii  <eliz@gnu.org>
 
+        * epa-file.el: Require epa-hook.
+
         * loadup.el ("epa-hook"): Load epa-hook instead of epa-file-hook.
 
         * epa-hook.el: Renamed from epa-file-hook.el, to avoid
-        file-names clashes on 8+3 filesystems.
+        file-names clashes on 8+3 filesystems.  Provide epa-hook.
 
         * org/org-jsinfo.el: Renamed from org-infojs.el, to avoid
         file-names clashes on 8+3 filesystems.
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index ce0fe74962b..25edba5a2dc 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -22,7 +22,7 @@
 ;;; Code:
 
 (require 'epa)
-(require 'epa-file-hook)
+(require 'epa-hook)
 
 (defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
   "If non-nil, cache passphrase for symmetric encryption."
diff --git a/lisp/epa-hook.el b/lisp/epa-hook.el
index 57c5304c45f..a84308fbe3f 100644
--- a/lisp/epa-hook.el
+++ b/lisp/epa-hook.el
@@ -102,7 +102,7 @@ Return the new status of auto encryption (non-nil means on)."
 (put 'epa-file-handler 'safe-magic t)
 (put 'epa-file-handler 'operations '(write-region insert-file-contents))
 
-(provide 'epa-file-hook)
+(provide 'epa-hook)
 
 ;; arch-tag: f75c8a50-d32e-4eb3-9ec6-9e940c1fc8b5
 ;;; epa-file-hook.el ends here