diff --git a/srcpkgs/base-system/template b/srcpkgs/base-system/template
index cae3cfbfe7f..8bf4bcef1a0 100644
--- a/srcpkgs/base-system/template
+++ b/srcpkgs/base-system/template
@@ -10,8 +10,9 @@ license="Public domain"
 
 replaces="base-system-runit>=0"
 
-makedepends="
- base-files>=0.77 ncurses coreutils findutils gcc glibc glibc-locales diffutils
+makedepends="gcc glibc"
+depends="
+ base-files>=0.77 ncurses coreutils findutils glibc-locales diffutils
  dash bash grep gzip file sed gawk less util-linux which tar man-pages
  man-db shadow e2fsprogs btrfs-progs xfsprogs f2fs-tools dosfstools kbd psmisc
  procps-ng tzdata pciutils iana-etc eudev runit-void openssh dhcpcd
@@ -19,17 +20,10 @@ makedepends="
  void-artwork traceroute ethtool parted kmod"
 
 case "$XBPS_TARGET_MACHINE" in
-	i686) makedepends+=" linux grub";;
-	x86_64) makedepends+=" linux grub-x86_64-efi";;
+	i686) makedepends+=" linux grub"; depends+=" linux grub";;
+	x86_64) makedepends+=" linux grub-x86_64-efi"; depends+=" linux grub-x86_64-efi";;
 esac
 
-# gcc and glibc shouldn't be direct dependencies.
-for f in ${makedepends}; do
-	if [ "$f" != "gcc" -a "$f" != "glibc" ]; then
-		depends+=" $f"
-	fi
-done
-
 do_install() {
 	# Create /sbin/init symlink to runit-init.
 	vmkdir usr/sbin