diff --git a/usr/lib/initcpio/install/arch_grub b/usr/lib/initcpio/install/arch_grub
index 823d58646..ba451de03 100644
--- a/usr/lib/initcpio/install/arch_grub
+++ b/usr/lib/initcpio/install/arch_grub
@@ -26,8 +26,11 @@ build ()
         add_file "$i"
     done
     
-    # add bios,i386-efi and x86_64-efi files
-    add_full_dir /usr/lib/grub
+    # add bios and x86_64-efi files
+    # i386 efi is very rare. They are only used in old Macs, 
+    # in which the kernel itself has issues booting in EFI mode
+    add_full_dir /usr/lib/grub/i386-pc  
+    add_full_dir /usr/lib/grub/x86_64-efi
     
     ## add grub(2) unicode font file
     add_file "/usr/share/grub/unicode.pf2"
diff --git a/usr/lib/initcpio/install/arch_pacman b/usr/lib/initcpio/install/arch_pacman
index cbb51cf46..2ffca9047 100644
--- a/usr/lib/initcpio/install/arch_pacman
+++ b/usr/lib/initcpio/install/arch_pacman
@@ -31,7 +31,7 @@ build ()
              syslinux mtools perl gmp krb5 sqlite db dbus-core libcap fsarchiver xz librpcsecgss \
              libtirpc wipe ddrescue testdisk ifplugd libdaemon wpa_actiond rfkill libgssglue icu gptfdisk \
              btrfs-progs nilfs-utils linux-firmware ipw2100-fw ipw2200-fw iana-etc chntpw \
-             grub-common grub-bios grub-efi-x86_64 grub-efi-i386 efibootmgr file eject keyutils yp-tools \
+             grub-common grub-bios grub-efi-x86_64 efibootmgr file eject keyutils yp-tools \
              curl smartmontools dnsmasq lftp openconnect libxml2 libproxy speedtouch tcpdump nmap lua weechat \
              gnutls nettle libtasn1 bind rpcbind expat progsreiserfs glib2 freetype2 libssh2 libedit \
              talloc eventlog idnkit libjpeg-turbo pth gnupg libksba libassuan pinentry dirmngr gpgme ldns \