--- /usr/lib/catalyst/targets/stage1/stage1-chroot.sh
+++ /usr/lib/catalyst/targets/stage1/stage1-chroot.sh
@@ -22,7 +22,7 @@
 # First, we drop in a known-good baselayout
 [ -e /etc/make.conf ] && \
 	echo 'USE="${USE} -build"' >> /etc/make.conf
-run_merge "--oneshot --nodeps sys-apps/baselayout"
+run_merge "--oneshot --nodeps sys-apps/baselayout sys-apps/shadow"
 sed -i '/USE="${USE} -build"/d' /etc/make.conf
 
 # Next, we install the package manager