diff --git a/reactos/boot/bootdata/bootcd/bootcd.rbuild b/reactos/boot/bootdata/bootcd/bootcd.rbuild
index 0cadb1b56a9..471a7f4863e 100644
--- a/reactos/boot/bootdata/bootcd/bootcd.rbuild
+++ b/reactos/boot/bootdata/bootcd/bootcd.rbuild
@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="bootcd" type="iso" output="ReactOS.iso">
-	<bootsector>isoboot</bootsector>
-</module>
+<if property="ARCH" value="i386>
+	<module name="bootcd" type="iso" output="ReactOS.iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</if>
+<ifnot property="ARCH" value="i386>
+	<module name="bootcd" type="iso" output="ReactOS-$(ARCH).iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</ifnot>
diff --git a/reactos/boot/bootdata/livecd/livecd.rbuild b/reactos/boot/bootdata/livecd/livecd.rbuild
index 9c95cc54d56..e92deca42ce 100644
--- a/reactos/boot/bootdata/livecd/livecd.rbuild
+++ b/reactos/boot/bootdata/livecd/livecd.rbuild
@@ -1,5 +1,12 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
-<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
-	<bootsector>isoboot</bootsector>
-</module>
+<if property="ARCH" value="i386>
+	<module name="livecd" type="liveiso" output="ReactOS-LiveCD.iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</if>
+<ifnot property="ARCH" value="i386>
+	<module name="livecd" type="liveiso" output="ReactOS-LiveCD-$(ARCH).iso">
+		<bootsector>isoboot</bootsector>
+	</module>
+</ifnot>