@@ -1248,18 +1248,20 @@ ; load this in a post-frame hook because gpg-agent asks for a password on first
 ; startup and caches it. Don't want emacs daemon to hang because of gpg-agent.
 (defun load-private-data ()
   (interactive)
-  (if (not have-private-key)
-      (message "ERROR: Private GPG key not found")
-    (unless (or (getenv "GPG_AGENT_INFO")
-                (getenv "SSH_AUTH_SOCK"))
-      (start-process "gpg-agent" nil "gpg-agent" "--daemon")
-      (setenv "SSH_AUTH_SOCK" gpg-agent-ssh-sock))
-    (setq password-cache-expiry nil)
-    (unless (file-exists-p (concat pinentry--socket-dir "pinentry"))
-      (pinentry-start)
-      (add-hook 'kill-emacs-hook 'pinentry-stop))
-    (add-to-list 'load-suffixes ".el.gpg")
-    (load-gpg (expand-file-name "private" user-emacs-directory))))
+  (if (not (file-exists-p (expand-file-name (concat system-name ".el.gpg") user-emacs-directory)))
+      (message "No encrypted configuration matches system name `%s'" system-name)
+    (if (not have-private-key)
+        (message "ERROR: Private GPG key not found")
+      (unless (or (getenv "GPG_AGENT_INFO")
+                  (getenv "SSH_AUTH_SOCK"))
+        (start-process "gpg-agent" nil "gpg-agent" "--daemon")
+        (setenv "SSH_AUTH_SOCK" gpg-agent-ssh-sock))
+      (setq password-cache-expiry nil)
+      (unless (file-exists-p (concat pinentry--socket-dir "pinentry"))
+        (pinentry-start)
+        (add-hook 'kill-emacs-hook 'pinentry-stop))
+      (add-to-list 'load-suffixes ".el.gpg")
+      (load-gpg (expand-file-name system-name user-emacs-directory)))))
 
 (defun first-frame-hook (frame)
   (remove-hook 'after-make-frame-functions #'first-frame-hook)