diff --git a/debian/control b/debian/control
index 723b7fe7..e11954f4 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Maintainer: LaMont Jones <lamont@canonical.com>
 Standards-Version: 3.6.1.0
 
 Package: livecd-rootfs
-Architecture: any
+Architecture: all
 Depends: sudo, debootstrap, rsync, cloop-utils, python-minimal|python
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem
diff --git a/debian/rules b/debian/rules
index b9a698a4..a5a86a74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,9 +6,9 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-VERSION=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-CLOOPIMG=livecd-root-${VERSION}-${ARCH}.cloopimg
+#ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
+#VERS=$(shell LC_ALL=C dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
+#CLOOPIMG=livecd-root-${VERS}-${ARCH}.cloopimg
 
 build: build-stamp
 build-stamp:
@@ -16,8 +16,6 @@ build-stamp:
 
 	# Add here commands to compile the package.
 	#$(MAKE)
-	chmod 755 debian/livecd.sh
-	sudo $$(pwd)/debian/livecd.sh
 
 	touch build-stamp
 
@@ -29,7 +27,6 @@ clean:
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
 	#-$(MAKE) distclean
-	rm -rf livecd*
 
 	dh_clean
 
@@ -42,12 +39,12 @@ install: build
 	# Add here commands to install the package into debian/<packagename>
 	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
 
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
 # Build architecture-dependent files here.
 binary-arch: build install
+# We have nothing to do by default.
+
+# Build architecture-independent files here.
+binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
@@ -74,9 +71,7 @@ binary-arch: build install
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-	install -m755 debian/livecd.sh debian/tmp/usr/sbin
-	mv livecd.cloop ../$(CLOOPIMG)
-	dpkg-distaddfile $(CLOOPIMG) byhand -
+	install -m755 livecd.sh debian/tmp/usr/sbin
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/livecd.sh b/livecd.sh
similarity index 88%
rename from debian/livecd.sh
rename to livecd.sh
index 9610f9da..a5aaa4e4 100755
--- a/debian/livecd.sh
+++ b/livecd.sh
@@ -85,10 +85,22 @@ mount -tproc none ${ROOT}proc
 cp ${ROOT}etc/apt/trusted.gpg ${ROOT}etc/apt/trusted.gpg.$$
 cat /etc/apt/trusted.gpg >> ${ROOT}etc/apt/trusted.gpg
 
+case $(dpkg --print-architecture) in
+  amd64)	KERNEL="linux-amd64-generic";;
+  i386)		KERNEL=linux-386;;
+  ia64)		KERNEL="linux-itanium-smp linux-mckinley-smp";;
+  powerpc)	KERNEL="linux-powerpc linux-power3 linux-power4";;
+
+  # and the bastard stepchildren
+  hppa)		KERNEL="linux-hppa32 linux-hppa64";;
+  sparc*)	KERNEL="linux-sparc64";;
+  *)		echo "Unknown architecture: no kernel."; exit 1;;
+esac
+
 # Create a good sources.list, and finish the install
 echo deb $MIRROR hoary main restricted > ${ROOT}etc/apt/sources.list
 chroot $ROOT apt-get update
-chroot $ROOT apt-get -y install ubuntu-base ubuntu-desktop linux-386 </dev/null
+chroot $ROOT apt-get -y install ubuntu-base ubuntu-desktop $KERNEL </dev/null
 
 # remove our diversions
 for file in $DIVERTS; do