diff --git a/elements/base/pkg-map b/elements/base/pkg-map
index 0906c7ba3..b09852deb 100644
--- a/elements/base/pkg-map
+++ b/elements/base/pkg-map
@@ -5,11 +5,6 @@
     },
     "suse": {
       "dkms_package": ""
-    },
-    "gentoo": {
-      "dkms_package": "",
-      "grub-pc": "grub",
-      "extlinux": "syslinux"
     }
   },
   "default": {
diff --git a/elements/bootloader/finalise.d/50-bootloader b/elements/bootloader/finalise.d/50-bootloader
index 4a904a2af..eb902f6c7 100755
--- a/elements/bootloader/finalise.d/50-bootloader
+++ b/elements/bootloader/finalise.d/50-bootloader
@@ -19,7 +19,7 @@ else
 fi
 
 function install_extlinux {
-    install-packages -m base extlinux
+    install-packages -m bootloader extlinux
 
     echo "Installing Extlinux..."
 
@@ -59,9 +59,9 @@ function install_grub2 {
     if [ -f "/tmp/grub/install" ] ; then
         source /tmp/grub/install
     elif [[ "$ARCH" =~ "ppc" ]]; then
-        install-packages -m base grub-ieee1275
+        install-packages -m bootloader grub-ieee1275
     else
-        install-packages -m base grub-pc
+        install-packages -m bootloader grub-pc
     fi
 
     # XXX: grub-probe on the nbd0/loop0 device returns nothing - workaround, manually
diff --git a/elements/bootloader/pkg-map b/elements/bootloader/pkg-map
new file mode 100644
index 000000000..1836288b1
--- /dev/null
+++ b/elements/bootloader/pkg-map
@@ -0,0 +1,17 @@
+{
+  "family": {
+    "gentoo": {
+      "dkms_package": "",
+      "extlinux": "syslinux",
+      "grub-pc": "grub"
+    },
+    "suse": {
+      "dkms_package": ""
+    }
+  },
+  "default": {
+    "dkms_package": "dkms",
+    "extlinux": "extlinux",
+    "grub-pc": "grub-pc"
+  }
+}