diff --git a/debian/changelog b/debian/changelog
index 8c99932f..ad28fd9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,12 +8,13 @@ livecd-rootfs (0.24) hoary-cat-UNRELEASED; urgency=low
   * Print package version during script run.
   * some HPPA fixes, allow architectures to have more than just main.
   * add debian/compat
+  * Add --resolve-deps to debootstrap command.
 
   [ Adam Conrad ]
   * Incorporate 'tocd' target, including hideous hack to get the
     germinate output from Colin's lists at people.ubuntu.com
 
- -- Adam Conrad <adconrad@0c3.net>  Fri, 30 Sep 2005 23:25:02 +1000
+ -- LaMont Jones <lamont@ubuntu.com>  Sun,  2 Oct 2005 17:03:44 -0600
 
 livecd-rootfs (0.23) hoary-cat; urgency=low
 
diff --git a/livecd.sh b/livecd.sh
index 705fc947..59d5ce00 100755
--- a/livecd.sh
+++ b/livecd.sh
@@ -163,7 +163,7 @@ Flags: seen
     esac
 
     dpkg -l livecd-rootfs	# get our version # in the log.
-    debootstrap --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR
+    debootstrap --resolve-deps --components=$(echo $COMP | sed 's/ /,/g') $STE $ROOT $MIRROR
 
     # Just make a few things go away, which lets us skip a few other things.
     DIVERTS="usr/sbin/mkinitrd usr/sbin/invoke-rc.d"
@@ -206,13 +206,11 @@ link_in_boot = no
     case $ARCH in
 	amd64)		LIST="$LIST linux-amd64-generic";;
 	i386)		LIST="$LIST linux-386";;
-	ia64)		LIST="$LIST linux-itanium-smp linux-mckinley-smp";;
 	powerpc)	LIST="$LIST linux-powerpc linux-power3 linux-power4";;
 
 	# and the bastard stepchildren
+	ia64)		LIST="$LIST linux-itanium-smp linux-mckinley-smp";;
 	hppa)		LIST="$LIST linux-hppa32-smp linux-hppa64-smp"
-			EXCLUDE="$EXCLUDE ubuntu-desktop kubuntu-desktop"	# can't handle it yet.
-			EXCLUDE="$EXCLUDE ubuntu-live kubuntu-live"		# can't handle it yet.
 			;;
 	sparc*)		LIST="$LIST linux-sparc64";;
 	*)		echo "Unknown architecture: no kernel."; exit 1;;