diff --git a/kali-config/common/includes.installer/kali-finish-install b/kali-config/common/includes.installer/kali-finish-install
index 21ea79d..50a0151 100755
--- a/kali-config/common/includes.installer/kali-finish-install
+++ b/kali-config/common/includes.installer/kali-finish-install
@@ -1,7 +1,8 @@
 #!/bin/sh
-
-# The reference version of this script is maintained in
-# ./kali-live/kali-config/common/includes.installer/kali-finish-install
+#
+# The reference version of this script is maintained in:
+#   ./kali-installer/simple-cdd/profiles/kali.postinst
+#   ./kali-live/kali-config/common/includes.installer/kali-finish-install
 #
 # It is used in multiple places to finish configuring the target system
 # and build.sh copies it where required (in the simple-cdd configuration
diff --git a/kali-config/common/includes.installer/preseed.cfg b/kali-config/common/includes.installer/preseed.cfg
index 759c937..8a171aa 100644
--- a/kali-config/common/includes.installer/preseed.cfg
+++ b/kali-config/common/includes.installer/preseed.cfg
@@ -1,9 +1,19 @@
+#
+# The reference version of this script is maintained in:
+#   ./kali-installer/simple-cdd/profiles/kali.preseed
+#   ./kali-live/kali-config/common/includes.installer/preseed.cfg
+#
+# Upstream: https://gitlab.com/kalilinux/packages/debian-installer/-/blob/kali/master/build/preseed.cfg
+#
+
 # This file replaces preseed.cfg embedded in the initrd by
 # debian-installer. It should be kept in sync except with the
 # mirror/{codename,suite} dropped so that the image installs
 # what's available on the CD instead of hardcoding a specific
 # release.
 
+## Questions from debian-installer
+
 # Default repository information (don't include codename data, d-i figures it
 # out from what's available in the ISO)
 d-i mirror/country string enter information manually
@@ -44,7 +54,7 @@ d-i pkgsel/update-policy select none
 # Disable question about extra media
 d-i apt-setup/cdrom/set-first boolean false
 
-## Questions from regular packages
+## Questions from Debian's regular packages
 
 # Disable popularity-contest
 popularity-contest popularity-contest/participate boolean false
@@ -53,15 +63,11 @@ popularity-contest popularity-contest/participate boolean false
 encfs encfs/security-information boolean true
 encfs encfs/security-information seen true
 
-# Random other questions
+## Random other questions
 console-setup console-setup/charmap47 select UTF-8
 samba-common samba-common/dhcp boolean false
-macchanger macchanger/automatically_run boolean false
-kismet-capture-common kismet-capture-common/install-users string 
-kismet-capture-common kismet-capture-common/install-setuid boolean true
-wireshark-common wireshark-common/install-setuid boolean true
-sslh sslh/inetd_or_standalone select standalone
-atftpd atftpd/use_inetd boolean false
+
+## Questions from Kali's packages
 
 # Defensive packages
 tripwire tripwire/installed boolean true
@@ -70,3 +76,20 @@ tripwire tripwire/rebuild-config boolean false
 tripwire tripwire/rebuild-policy boolean false
 tripwire tripwire/use-localkey boolean false
 tripwire tripwire/use-sitekey boolean false
+
+# Do not register it in inetd so that its status can be controlled
+# individually
+atftpd atftpd/use_inetd boolean false
+
+# Install wireshark setuid
+wireshark-common wireshark-common/install-setuid boolean true
+
+# Disable autorun with macchanger
+macchanger macchanger/automatically_run boolean false
+
+# Install kismet setuid
+kismet-capture-common kismet-capture-common/install-users string
+kismet-capture-common kismet-capture-common/install-setuid boolean true
+
+# Use own process for sslh
+sslh sslh/inetd_or_standalone select standalone
diff --git a/kali-config/common/preseed/kali.cfg.chroot b/kali-config/common/preseed/kali.cfg.chroot
index 7c1d27e..2fb75b3 100644
--- a/kali-config/common/preseed/kali.cfg.chroot
+++ b/kali-config/common/preseed/kali.cfg.chroot
@@ -1,7 +1,2 @@
-# Various preseeding for auto-installed packages
-
-# Do not register it in inetd so that its status can be controlled
-# individually
-atftpd atftpd/use_inetd boolean false
-# Install wireshark setuid
-wireshark-common wireshark-common/install-setuid boolean true
+# May want to review:
+#   ./kali-config/common/includes.installer/preseed.cfg