diff --git a/MAINT_TOOLS/stuff_core.rc b/MAINT_TOOLS/stuff_core.rc
new file mode 100644
index 0000000..2c683de
--- /dev/null
+++ b/MAINT_TOOLS/stuff_core.rc
@@ -0,0 +1,8 @@
+#!/bin/rc
+
+fn enum_core_deps { for (i in `{cat /var/db/kiss/repos/kiss-mfavila/core-mod/core/*/depends|cut -f1 -d' '}){printf '%s\n' $i}}
+
+fn get_dep_paths { list=`{for (i in `{for (i in `enum_core_deps){kiss search $i|grep -v installed|grep -v 'core-mod/core'}}){printf '%s\n' $i}}
+printf %s\n $list|tr ' ' '\n'|sort|uniq}
+
+fn move_deps { for (i in `get_dep_paths){sup mv $i /var/db/kiss/repos/kiss-mfavila/core-mod/core/}}
diff --git a/ports/rc/build b/ports/rc-git/build
similarity index 100%
rename from ports/rc/build
rename to ports/rc-git/build
diff --git a/ports/rc-git/depends b/ports/rc-git/depends
new file mode 100644
index 0000000..90d6482
--- /dev/null
+++ b/ports/rc-git/depends
@@ -0,0 +1,3 @@
+autoconf make
+automake make
+editline
diff --git a/ports/rc/sources b/ports/rc-git/sources
similarity index 100%
rename from ports/rc/sources
rename to ports/rc-git/sources
diff --git a/ports/rc/version b/ports/rc-git/version
similarity index 100%
rename from ports/rc/version
rename to ports/rc-git/version
diff --git a/ports/rc/depends b/ports/rc/depends
deleted file mode 100644
index 63a1550..0000000
--- a/ports/rc/depends
+++ /dev/null
@@ -1,3 +0,0 @@
-autoconf
-automake
-editline
diff --git a/ports/util-linux/build b/ports/util-linux/build
deleted file mode 100755
index 76c1f23..0000000
--- a/ports/util-linux/build
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh -e
-
-./configure \
-    --prefix=/usr \
-    --localstatedir=/var \
-    --bindir=/usr/bin \
-    --sbindir=/usr/bin \
-    --libdir=/usr/lib \
-    --enable-libuuid \
-    --enable-libblkid \
-    --enable-fsck \
-    --disable-makeinstall-chown \
-    --disable-rpath \
-    --without-udev \
-    --without-python \
-    --without-systemd
-
-make
-make DESTDIR="$1" install
-
-# Fix broken --sbindir.
-mv -f "$1/usr/sbin/"* "$1/usr/bin"
-rmdir "$1/usr/sbin"
diff --git a/ports/util-linux/checksums b/ports/util-linux/checksums
deleted file mode 100644
index 7a41163..0000000
--- a/ports/util-linux/checksums
+++ /dev/null
@@ -1 +0,0 @@
-09fac242172cd8ec27f0739d8d192402c69417617091d8c6e974841568f37eed
diff --git a/ports/util-linux/depends b/ports/util-linux/depends
deleted file mode 100644
index fa3ea98..0000000
--- a/ports/util-linux/depends
+++ /dev/null
@@ -1,2 +0,0 @@
-linux-headers make
-
diff --git a/ports/util-linux/sources b/ports/util-linux/sources
deleted file mode 100644
index feda5b3..0000000
--- a/ports/util-linux/sources
+++ /dev/null
@@ -1 +0,0 @@
-https://cdn.kernel.org/pub/linux/utils/util-linux/v2.36/util-linux-2.36.1.tar.xz
diff --git a/ports/util-linux/version b/ports/util-linux/version
deleted file mode 100644
index acefb62..0000000
--- a/ports/util-linux/version
+++ /dev/null
@@ -1 +0,0 @@
-2.36.1 1