diff --git a/contrib/kiss-depends-finder b/contrib/kiss-depends-finder
index 1fe90ce..c8b6ccf 100755
--- a/contrib/kiss-depends-finder
+++ b/contrib/kiss-depends-finder
@@ -34,7 +34,7 @@ while read -r file; do
 
         # Skip listing these packages as dependencies.
         case $pkg in
-            musl|gcc|"$1") ;;
+            musl|gcc|llvm|"$1") ;;
             *) printf '%s\n' "$pkg" ;;
         esac
     done
diff --git a/contrib/kiss-orphans b/contrib/kiss-orphans
index 2130e84..2ecd6ba 100755
--- a/contrib/kiss-orphans
+++ b/contrib/kiss-orphans
@@ -6,7 +6,7 @@ cd "$KISS_ROOT/var/db/kiss/installed/"
 for pkg in *; do
     case $pkg in
         baseinit|baselayout|gcc|pkgconf|e2fsprogs|musl|\
-        make|busybox|bzip2|grub|automake|kiss|rsync|git)
+        make|busybox|bzip2|grub|kiss|rsync|git|linux-headers)
             continue
     esac
 
diff --git a/contrib/kiss-reset b/contrib/kiss-reset
index f7c9ef3..31e0e94 100755
--- a/contrib/kiss-reset
+++ b/contrib/kiss-reset
@@ -1,12 +1,11 @@
-#!/bin/sh -ef
+#!/bin/sh -e
 # Remove all packages except for the base.
-#
-# Disable word-splittng warnings as they're safe here.
-# shellcheck disable=SC2046
 
 set --
 
-while read -r pkg _; do
+for pkg in "$KISS_ROOT/var/db/kiss/installed/"*; do
+    pkg=${pkg##*/}
+
     case $pkg in
         baselayout|binutils|bison|busybox|bzip2|curl|flex|gcc|git|\
         gzip|kiss|libressl|linux-headers|m4|make|musl|pkgconf|rsync|\
@@ -14,9 +13,7 @@ while read -r pkg _; do
 
         *) set -- "$@" "$pkg" ;;
     esac
-done <<EOF
-$(kiss l)
-EOF
+done
 
 [ "$1" ] && {
     printf 'WARNING: This will remove \033[1m%s\033[m package(s).\n' "$#"