diff --git a/make/isolinux.mk b/make/isolinux.mk
index 55661521..63d9bdfd 100644
--- a/make/isolinux.mk
+++ b/make/isolinux.mk
@@ -60,11 +60,15 @@ unpack.done: dload.done
 
 copy.done: unpack.done dirs.done $(CD_FILES)
 	mkdir -p $(BUILD_DIR)
-	cp $(CD_FILES) $(BUILD_DIR)/
+	for i in $(CD_FILES); do \
+		n=`basename $$i | tr [A-Z] [a-z] | sed 's/\.tar\.gz/.tgz/; s/-/_/g; s/\([^.]*\)\.\([^.]*\)$$/\1@\2/; s/\./_/g; s/@/./'` ;\
+		echo "copying $$i -> $(BUILD_DIR)/$$n" ;\
+		cp $$i $(BUILD_DIR)/$$n ;\
+	done
 	touch $@
 
 $(ISO_IMAGE): copy.done
-	mkisofs -l -o $(ISO_IMAGE) \
+	mkisofs -l --iso-level 2 -o $(ISO_IMAGE) \
                 -b isolinux.bin -c boot.cat \
                 -no-emul-boot -boot-load-size 4 -boot-info-table \
 		$(BUILD_DIR)