diff --git a/usr/lib/initcpio/install/arch_pacman b/usr/lib/initcpio/install/arch_pacman
index 05c42c309..4a01a3a40 100644
--- a/usr/lib/initcpio/install/arch_pacman
+++ b/usr/lib/initcpio/install/arch_pacman
@@ -5,12 +5,16 @@ build ()
 {
     apps="/usr/bin/pacman /usr/bin/pacman-db-upgrade /usr/bin/pacman-key /usr/bin/pacsort \
           /usr/bin/pactree /usr/bin/cleanupdelta /usr/bin/makepkg /usr/bin/pacman-optimize /usr/bin/pkgdelta \
-          /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/repo-elephant /usr/bin/repo-remove /usr/bin/testdb \
-          /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl /usr/bin/gpg /usr/bin/gpg-agent /usr/sbin/haveged"
+          /usr/bin/rankmirrors /usr/bin/repo-add /usr/bin/testdb \
+          /usr/bin/testpkg /usr/bin/vercmp /usr/bin/curl /usr/bin/gpg-agent /usr/sbin/haveged"
     for i in $apps; do
         add_binary "$i"
     done
-
+    symlinks="/usr/bin/gpg /usr/bin/repo-elephant /usr/bin/repo-remove"
+    for i in $symlinks; do
+        add_binary "$(which $(basename $(readlink "$i")))"
+        add_symlink "$i" "$(which $(basename $(readlink "$i")))"
+    done
     DEPENDS="systemd-sysvcompat wget bash coreutils cryptsetup dialog \
              e2fsprogs findutils gawk grep iputils jfsutils less lvm2 mdadm kmod nano \
              ncurses net-tools gnu-netcat ntfsprogs pcmciautils procps-ng psmisc reiserfsprogs sed snarf \