diff --git a/reactos/boot/bootdata/arm/directory.rbuild b/reactos/boot/bootdata/arm/directory.rbuild
new file mode 100644
index 00000000000..7387d110f6b
--- /dev/null
+++ b/reactos/boot/bootdata/arm/directory.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+</group>
\ No newline at end of file
diff --git a/reactos/boot/bootdata/bootdata.rbuild b/reactos/boot/bootdata/bootdata.rbuild
index db1da783ea8..231e1dd38b4 100644
--- a/reactos/boot/bootdata/bootdata.rbuild
+++ b/reactos/boot/bootdata/bootdata.rbuild
@@ -4,12 +4,25 @@
 	<cdfile>autorun.inf</cdfile>
 	<cdfile>icon.ico</cdfile>
 	<cdfile>readme.txt</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
-	<cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+	<if property="ARCH" value="i386">
+		<directory name="i386">
+			<xi:include href="i386/directory.rbuild" />
+		</directory>
+	</if>
+<!--
+	<if property="ARCH" value="powerpc">
+		<directory name="ppc">
+			<xi:include href="ppc/directory.rbuild" />
+		</directory>
+	</if>
+-->
+	<if property="ARCH" value="arm">
+		<directory name="arm">
+			<xi:include href="arm/directory.rbuild" />
+		</directory>
+	</if>
+
 	<directory name="bootcd">
 		<xi:include href="bootcd/bootcd.rbuild" />
 	</directory>
diff --git a/reactos/boot/bootdata/i386/directory.rbuild b/reactos/boot/bootdata/i386/directory.rbuild
new file mode 100644
index 00000000000..7387d110f6b
--- /dev/null
+++ b/reactos/boot/bootdata/i386/directory.rbuild
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+
+	<cdfile installbase="$(CDOUTPUT)">hivecls.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivedef.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesft.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">hivesys.inf</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">txtsetup.sif</cdfile>
+	<cdfile installbase="$(CDOUTPUT)">unattend.inf</cdfile>
+
+</group>
\ No newline at end of file