diff --git a/auto/config b/auto/config
index 7286bca..e454dd1 100755
--- a/auto/config
+++ b/auto/config
@@ -108,8 +108,7 @@ lb config noauto \
 	--distribution "$dist" \
 	--debian-installer-distribution "$dist" \
 	--archive-areas "main contrib non-free" \
-	--bootstrap cdebootstrap \
-	--cdebootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg --suite-config=wheezy" \
+	--debootstrap-options "--keyring=/usr/share/keyrings/kali-archive-keyring.gpg" \
 	--keyring-packages kali-archive-keyring \
 	--updates false \
 	--backports false \
diff --git a/build.sh b/build.sh
index 4a233bf..4c87289 100755
--- a/build.sh
+++ b/build.sh
@@ -145,6 +145,13 @@ if ! echo "$ver_live_build" | grep -q kali; then
 	exit 1
 fi
 
+# Check we have a good debootstrap
+ver_debootstrap=$(dpkg-query -f '${Version}' -W debootstrap)
+if ! echo "$ver_debootstrap" | grep -q kali; then
+	echo "ERROR: You need a Kali patched debootstrap. Your current version: $ver_debootstrap" >&2
+	exit 1
+fi
+
 # We need root rights at some point
 if [ "$(whoami)" != "root" ]; then
 	if ! which $SUDO >/dev/null; then