diff --git a/Formula/gnupg@1.4.rb b/Formula/gnupg@1.4.rb
index 53077413aa..718af9ec15 100644
--- a/Formula/gnupg@1.4.rb
+++ b/Formula/gnupg@1.4.rb
@@ -4,6 +4,7 @@ class GnupgAT14 < Formula
   url "https://gnupg.org/ftp/gcrypt/gnupg/gnupg-1.4.23.tar.bz2"
   mirror "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.23.tar.bz2"
   sha256 "c9462f17e651b6507848c08c430c791287cd75491f8b5a8b50c6ed46b12678ba"
+  revision 1
 
   bottle do
     sha256 "06712329d11b029b7e1fcc0064d72865caa5e65c93fb39ccababc67320991f8c" => :high_sierra
@@ -36,10 +37,17 @@ class GnupgAT14 < Formula
     # https://lists.gnupg.org/pipermail/gnupg-devel/2016-August/031533.html
     inreplace bin/"gpg-zip1", "GPG=gpg", "GPG=gpg1"
 
+    # link to libexec binaries without the "1" suffix
+    # gpg1 will call them without the suffix when it needs to
+    %w[curl finger hkp ldap].each do |cmd|
+      cmd.prepend("gpgkeys_")
+      (libexec/"gnupg").install_symlink (cmd + "1") => cmd
+    end
+
     # Although gpg2 support should be pretty universal these days
     # keep vanilla `gpg` executables available, at least for now.
-    %w[gpg-zip1 gpg1 gpgsplit1 gpgv1].each do |cmd|
-      (libexec/"gpgbin").install_symlink bin/cmd => cmd.to_s.sub(/1/, "")
+    %w[gpg-zip gpg gpgsplit gpgv].each do |cmd|
+      (libexec/"gpgbin").install_symlink bin/(cmd + "1") => cmd
     end
   end