diff --git a/Makefile b/Makefile
index c2f79703..28cd4c21 100755
--- a/Makefile
+++ b/Makefile
@@ -596,7 +596,7 @@ src-images: ok src-md5list $(OUT)
 
 # Generate the *.list files for the Pseudo Image Kit
 pi-makelist:
-	@for file in $(OUT)/$(CODENAME)-*.raw; do \
+	@cd $(OUT); for file in `find * -name \*.raw`; do \
 		$(BASEDIR)/tools/pi-makelist \
 			$$file > $${file%%.raw}.list; \
 	done
@@ -621,7 +621,7 @@ src-image: ok src-md5list $(OUT)
 
 #Calculate the md5sums for the images
 imagesums:
-	@cd $(OUT); :> MD5SUMS; for file in *.raw; do \
+	@cd $(OUT); :> MD5SUMS; for file in `find * -name \*.raw`; do \
 	      md5sum $$file >>MD5SUMS; \
 	 done
 
diff --git a/build_all.sh b/build_all.sh
index 2965b199..4dc195f7 100755
--- a/build_all.sh
+++ b/build_all.sh
@@ -4,7 +4,9 @@
 
 . CONF.sh
 
-for ARCH in i386 m68k alpha sparc powerpc
+TMP_OUT=$OUT
+
+for ARCH in i386 m68k alpha sparc powerpc arm
 do
 	export ARCH
 	echo "Now we're going to build CD for $ARCH !"
@@ -33,8 +35,13 @@ do
 	make list COMPLETE=1 $SIZE_ARGS SRCSIZELIMIT=$((635 * 1024 * 1024))
 	echo " ... building the images"
 	if [ "$ARCH" = "i386" ]; then
-		make official_images
+		export OUT="$TMP_OUT/$ARCH"; mkdir -p $OUT
+		make bin-official_images
+
+		export OUT="$TMP_OUT/src"; mkdir -p $OUT
+		make src-official_images
 	else
+		export OUT=$TMP_OUT/$ARCH; mkdir -p $OUT
 		make bin-official_images
 		if [ $? -gt 0 ]; then
 			echo "ERROR WHILE BUILDING OFFICIAL IMAGES !!" >&2
@@ -48,3 +55,4 @@ do
 done
 
 make imagesums
+make pi-makelist
diff --git a/debian/changelog b/debian/changelog
index 6f17bd05..990b1d95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ debian-cd (2.2.1) frozen unstable; urgency=low
   * Added extra file to help fine tune the CD sizes per archs
   * Edited boot-alpha to work (I hope) based on what was available in the
     README.txt in boot-floppies
+  * Modified build_all.sh so that it puts each arch under a subdir and
+    modified imagesums/pi-makelist to support the subdirs
 
  -- Raphael Hertzog <hertzog@debian.org>  Sat, 20 May 2000 23:42:58 +0200