diff --git a/build/jam/FloppyBootImage b/build/jam/FloppyBootImage
index 728dacb579..34cf51113b 100644
--- a/build/jam/FloppyBootImage
+++ b/build/jam/FloppyBootImage
@@ -163,6 +163,9 @@ MakeLocate $(HAIKU_BOOT_FLOPPY) : $(HAIKU_OUTPUT_DIR) ;
 
 BuildFloppyBootImage $(HAIKU_BOOT_FLOPPY) : zbeos : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
 
+# remove the archive
+RmTemps $(HAIKU_BOOT_FLOPPY) : $(HAIKU_FLOPPY_BOOT_ARCHIVE) ;
+
 NotFile haiku-boot-floppy ;
 Depends haiku-boot-floppy : $(HAIKU_BOOT_FLOPPY) ;
 
diff --git a/build/jam/HaikuCD b/build/jam/HaikuCD
index 23aaef21ba..2858920aea 100644
--- a/build/jam/HaikuCD
+++ b/build/jam/HaikuCD
@@ -36,18 +36,6 @@ if $(optionalPackageDescriptions) {
 		: optionalPackageDescriptions ;
 }
 
-
-# create the other scripts
-HAIKU_CD_MAKE_DIRS_SCRIPT = <HaikuCD>haiku.cd-make-dirs ;
-HAIKU_CD_COPY_FILES_SCRIPT = <HaikuCD>haiku.cd-copy-files ;
-HAIKU_CD_UNZIP_FILES_SCRIPT = <HaikuCD>haiku.cd-unzip-files ;
-MakeLocate $(HAIKU_CD_MAKE_DIRS_SCRIPT) $(HAIKU_CD_COPY_FILES_SCRIPT)
-	$(HAIKU_CD_UNZIP_FILES_SCRIPT) : $(HAIKU_OUTPUT_DIR) ;
-
-CreateHaikuImageMakeDirectoriesScript $(HAIKU_CD_MAKE_DIRS_SCRIPT) ;
-CreateHaikuImageCopyFilesScript $(HAIKU_CD_COPY_FILES_SCRIPT) ;
-CreateHaikuImageUnzipFilesScript $(HAIKU_CD_UNZIP_FILES_SCRIPT) ;
-
 # Convenience wrapper rule around BuildHaikuCD.
 rule _BuildHaikuCD haikuCD : bootFloppy
 {
@@ -55,23 +43,23 @@ rule _BuildHaikuCD haikuCD : bootFloppy
 	#
 
 	# build the cd
-	# HAIKU_CD_EARLY_USER_SCRIPTS, HAIKU_CD_LATE_USER_SCRIPTS can be
+	# HAIKU_IMAGE_EARLY_USER_SCRIPTS, HAIKU_IMAGE_LATE_USER_SCRIPTS can be
 	# specified by the user.
 	BuildHaikuCD $(haikuCD) : $(bootFloppy) :
 		$(HAIKU_CD_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_CD_EARLY_USER_SCRIPTS)
-		$(HAIKU_CD_MAKE_DIRS_SCRIPT)
-		$(HAIKU_CD_COPY_FILES_SCRIPT)
-		$(HAIKU_CD_UNZIP_FILES_SCRIPT)
-		$(HAIKU_CD_LATE_USER_SCRIPTS)
+		$(HAIKU_IMAGE_EARLY_USER_SCRIPTS)
+		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
+		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
+		$(HAIKU_IMAGE_UNZIP_FILES_SCRIPT)
+		$(HAIKU_IMAGE_LATE_USER_SCRIPTS)
 	;
 
 	# remove the scripts we have generated
 	RmTemps $(haikuCD) :
 		$(HAIKU_CD_INIT_VARIABLES_SCRIPT)
-		$(HAIKU_CD_MAKE_DIRS_SCRIPT)
-		$(HAIKU_CD_COPY_FILES_SCRIPT)
-		$(HAIKU_CD_UNZIP_FILES_SCRIPT)
+		$(HAIKU_IMAGE_MAKE_DIRS_SCRIPT)
+		$(HAIKU_IMAGE_COPY_FILES_SCRIPT)
+		$(HAIKU_IMAGE_UNZIP_FILES_SCRIPT)
 	;
 }
 
@@ -80,5 +68,7 @@ _BuildHaikuCD $(HAIKU_CD) : $(HAIKU_BOOT_FLOPPY) ;
 NotFile haiku-cd ;
 Depends haiku-cd : $(HAIKU_CD) ;
 
+RmTemps $(HAIKU_CD) : $(HAIKU_BOOT_FLOPPY) ;
+
 # Execute post-image user config rules.
 UserBuildConfigRulePostImage ;
diff --git a/build/scripts/build_haiku_cd b/build/scripts/build_haiku_cd
index 500d7dad64..36f49ce959 100755
--- a/build/scripts/build_haiku_cd
+++ b/build/scripts/build_haiku_cd
@@ -150,4 +150,4 @@ echo "Building CD image ..."
 mkisofs -b `basename $cdBootFloppy` -U -R -V "$cdLabel" -o "$cdImagePath" "$tPrefix"
 
 # cleanup output dir
-#$rmAttrs -rf "$outputDir"
+$rmAttrs -rf "$outputDir"