diff --git a/core/baseinit/build b/core/baseinit/build
index 00b324d6..f46a58ab 100755
--- a/core/baseinit/build
+++ b/core/baseinit/build
@@ -1,8 +1,9 @@
 #!/bin/sh -e
 
-install -dm 755 "$1/etc"
+mkdir -p "$1/etc/runit"
 
 for f in inittab rc.boot; do
     install -m 644 "$f" "$1/etc"
 done
 
+cp -R stages "$1/etc/runit"
diff --git a/core/baseinit/checksums b/core/baseinit/checksums
index 474b2dcf..e69de29b 100644
--- a/core/baseinit/checksums
+++ b/core/baseinit/checksums
@@ -1,2 +0,0 @@
-c65d69ade8d0bf6d92d01545323acff68c43cb1296bae8efcbf03faa5b0c653c  inittab
-8e243f895741287fecd52a73b354c1bba846dd0312648be7656ea6d84c955e73  rc.boot
diff --git a/core/baseinit/files/inittab b/core/baseinit/files/inittab
deleted file mode 100644
index 40d7720b..00000000
--- a/core/baseinit/files/inittab
+++ /dev/null
@@ -1,4 +0,0 @@
-::sysinit:/etc/rc.boot
-::respawn:/bin/runsvdir-start
-::restart:/sbin/init
-::shutdown:/etc/rc.shutdown
diff --git a/core/baseinit/files/rc.boot b/core/baseinit/files/rc.boot
deleted file mode 100644
index 292443a5..00000000
--- a/core/baseinit/files/rc.boot
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-PATH=/usr/bin:/usr/sbin
-
-log() {
-    printf '\e[31;1m=>\e[m %s\n' "$@"
-}
-
-mnt() {
-    mountpoint -q "$1" || {
-        dir=$1
-        shift
-        mount "$@" "$dir"
-    }
-}
-
-log "Welcome to KISS!"
-log "Mounting pseudo filesystems..."
-
-mnt /proc -o nosuid,noexec,nodev    -t proc     proc
-mnt /sys  -o nosuid,noexec,nodev    -t sysfs    sys
-mnt /run  -o mode=0755,nosuid,nodev -t tmpfs    run
-mnt /dev  -o mode=0755,nosuid       -t devtmpfs dev
-
-# shellcheck disable=2174
-mkdir -pm 0755 /run/runit \
-               /run/lvm   \
-               /run/user  \
-               /run/lock  \
-               /run/log   \
-               /dev/pts   \
-               /dev/shm
-
-mnt /dev/pts -o mode=0620,gid=5,nosuid,noexec -nt devpts     devpts
-mnt /dev/shm -o mode=1777,nosuid,nodev        -nt tmpfs      shm
-mnt /sys/kernel/security                      -nt securityfs securityfs
diff --git a/core/baseinit/manifest b/core/baseinit/manifest
index eb9a1265..136c260b 100644
--- a/core/baseinit/manifest
+++ b/core/baseinit/manifest
@@ -2,15 +2,19 @@
 /var/db/kiss/baseinit/sources
 /var/db/kiss/baseinit/manifest
 /var/db/kiss/baseinit/licenses
-/var/db/kiss/baseinit/files/rc.boot
-/var/db/kiss/baseinit/files/inittab
-/var/db/kiss/baseinit/files/
 /var/db/kiss/baseinit/checksums
 /var/db/kiss/baseinit/build
 /var/db/kiss/baseinit/
 /var/db/kiss/
 /var/db/
 /var/
+/etc/runit/stages/04-sysctl.sh
+/etc/runit/stages/03-misc.sh
+/etc/runit/stages/02-filesystems.sh
+/etc/runit/stages/01-mdev.sh
+/etc/runit/stages/00-pseudo-filesystems.sh
+/etc/runit/stages/
+/etc/runit/
 /etc/rc.boot
 /etc/inittab
 /etc/
diff --git a/core/baseinit/sources b/core/baseinit/sources
index eacad5f2..7cdef9a1 100644
--- a/core/baseinit/sources
+++ b/core/baseinit/sources
@@ -1,2 +1 @@
-files/inittab
-files/rc.boot
+git:https://github.com/kissx/kiss-init
diff --git a/core/baseinit/version b/core/baseinit/version
index 2fb73a07..a383ea1a 100644
--- a/core/baseinit/version
+++ b/core/baseinit/version
@@ -1 +1 @@
-1 1
+git 1