diff --git a/Makefile b/Makefile
index 4311687..3d702eb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ prepare: $(O)/.prepared
 
 $(O)/.host-tools: \
 		build-host-tools.sh \
-		$(CONFIGDIR)/host-tools.packages \
+		host-tools.packages \
 		$(shell find $(CONFIGDIR)/portage/host -type f) \
 		$(O)/.prepared
 	./build-host-tools.sh
@@ -29,6 +29,8 @@ host-tools: $(O)/.host-tools
 
 $(O)/.built: \
 		build.sh \
+		build.packages \
+		install.packages \
 		$(CONFIGDIR)/build.packages \
 		$(CONFIGDIR)/install.packages \
 		$(shell find $(CONFIGDIR)/portage/target -type f) \
@@ -39,6 +41,7 @@ $(O)/.built: \
 
 $(O)/.ready: \
 		build-rootfs.sh \
+		install.packages \
 		$(CONFIGDIR)/install.packages \
 		$(CONFIGDIR)/installonly.packages \
 		$(CONFIGDIR)/busybox.symlinks \
diff --git a/build-host-tools.sh b/build-host-tools.sh
index c211654..e8de078 100755
--- a/build-host-tools.sh
+++ b/build-host-tools.sh
@@ -2,5 +2,5 @@
 # vim: set sw=4 ts=4 sts=4 et :
 
 PORTAGE_CONFIGROOT="${CONFIGDIR:=${PWD}}"/portage/host \
-< "${CONFIGDIR}"/host-tools.packages xargs -ro \
+< host-tools.packages xargs -ro \
 emerge -vnuUj --rebuilt-binaries=y
diff --git a/build-rootfs.sh b/build-rootfs.sh
index 1a6b00d..6130ee0 100755
--- a/build-rootfs.sh
+++ b/build-rootfs.sh
@@ -21,15 +21,21 @@ ln -snf \
     /var/db/repos/gentoo/profiles/${profile} \
     /mnt/gentoo/etc/portage/make.profile
 
-ROOT=/mnt/gentoo \
-PORTAGE_CONFIGROOT="${CONFIGDIR}"/portage/target \
-< "${CONFIGDIR}"/install.packages xargs -ro \
-${target}-emerge -KvnuUDj --rebuilt-binaries=y
+cat \
+    install.packages \
+    "${CONFIGDIR}"/install.packages \
+    | xargs -ro \
+${target}-emerge \
+    --root=/mnt/gentoo \
+    --config-root="${CONFIGDIR}"/portage/target \
+    -KvnuUDj \
+    --rebuilt-binaries=y
 
-ROOT=/mnt/gentoo \
-PORTAGE_CONFIGROOT="${CONFIGDIR}"/portage/target \
 < "${CONFIGDIR}"/installonly.packages xargs -ro \
-${target}-emerge -vnuUDj
+${target}-emerge \
+    --root=/mnt/gentoo \
+    --config-root="${CONFIGDIR}"/portage/target \
+    -vnuUDj
 
 ROOT=/mnt/gentoo \
 locale-gen
diff --git a/build.packages b/build.packages
new file mode 100644
index 0000000..9677552
--- /dev/null
+++ b/build.packages
@@ -0,0 +1,2 @@
+sys-boot/raspberrypi-firmware
+sys-boot/u-boot
diff --git a/build.sh b/build.sh
index c27ddfc..2403d51 100755
--- a/build.sh
+++ b/build.sh
@@ -12,6 +12,8 @@ export PORTAGE_CONFIGROOT="${CONFIGDIR}"/portage/target
 ${target}-emerge -vuUDj sys-apps/util-linux
 
 cat \
+    build.packages \
+    install.packages \
     "${CONFIGDIR}"/build.packages \
     "${CONFIGDIR}"/install.packages \
     | xargs -ro \
diff --git a/yellow/host-tools.packages b/host-tools.packages
similarity index 100%
rename from yellow/host-tools.packages
rename to host-tools.packages
diff --git a/install.packages b/install.packages
new file mode 100644
index 0000000..19d1144
--- /dev/null
+++ b/install.packages
@@ -0,0 +1,6 @@
+net-misc/openssh
+net-misc/wget
+sec-policy/selinux-aimee-os
+sys-apps/busybox
+sys-apps/systemd
+sys-fs/btrfs-progs
diff --git a/yellow/build.packages b/yellow/build.packages
index a5650ea..3a5cf6b 100644
--- a/yellow/build.packages
+++ b/yellow/build.packages
@@ -1,3 +1 @@
 sys-boot/grub
-sys-boot/raspberrypi-firmware
-sys-boot/u-boot
diff --git a/yellow/install.packages b/yellow/install.packages
index 19d1144..e69de29 100644
--- a/yellow/install.packages
+++ b/yellow/install.packages
@@ -1,6 +0,0 @@
-net-misc/openssh
-net-misc/wget
-sec-policy/selinux-aimee-os
-sys-apps/busybox
-sys-apps/systemd
-sys-fs/btrfs-progs