diff --git a/reactos/hal/hal.rbuild b/reactos/hal/hal.rbuild
index b846b042bf5..5fcdc0a4621 100644
--- a/reactos/hal/hal.rbuild
+++ b/reactos/hal/hal.rbuild
@@ -2,7 +2,13 @@
 <!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 
-    <if property="ARCH" value="i386">
+	<if property="ARCH" value="i386">
+	    <directory name="halx86">
+		    <xi:include href="halx86/directory.rbuild" />
+	    </directory>
+	</if>
+
+	<if property="ARCH" value="amd64">
 	    <directory name="halx86">
 		    <xi:include href="halx86/directory.rbuild" />
 	    </directory>
diff --git a/reactos/hal/halx86/hal_generic.rbuild b/reactos/hal/halx86/hal_generic.rbuild
index 98cb36b95a5..971ffc83896 100644
--- a/reactos/hal/halx86/hal_generic.rbuild
+++ b/reactos/hal/halx86/hal_generic.rbuild
@@ -74,22 +74,38 @@
 				<file>sysbus.c</file>
 			</directory>
 			<file>beep.c</file>
-			<file>bios.c</file>
 			<file>cmos.c</file>
 			<file>dma.c</file>
 			<file>display.c</file>
 			<file>drive.c</file>
-			<file>misc.c</file>
-			<file>pic.c</file>
-			<file>portio.c</file>
-			<file>processor.c</file>
 			<file>profil.c</file>
 			<file>reboot.c</file>
 			<file>spinlock.c</file>
 			<file>sysinfo.c</file>
-			<file>systimer.S</file>
 			<file>timer.c</file>
 			<file>usage.c</file>
+			<if property="ARCH" value="i386">
+				<file>bios.c</file>
+				<file>misc.c</file>
+				<file>pic.c</file>
+				<file>trap.S</file>
+				<file>usage.c</file>
+				<directory name="i386">
+					<file>portio.c</file>
+					<file>systimer.S</file>
+					<file>v86.s</file>
+				</directory>
+			</if>
+			<if property="ARCH" value="amd64">
+				<directory name="amd64">
+					<file>halinit.c</file>
+					<file>irq.S</file>
+					<file>misc.c</file>
+					<file>apic.c</file>
+					<file>systimer.S</file>
+					<file>usage.c</file>
+				</directory>
+			</if>
 		</directory>
 		<directory name="up">
 			<file>halinit_up.c</file>
diff --git a/reactos/hal/halx86/halamd64.rbuild b/reactos/hal/halx86/halamd64.rbuild
index a4d9eb771df..5deb29fb68e 100644
--- a/reactos/hal/halx86/halamd64.rbuild
+++ b/reactos/hal/halx86/halamd64.rbuild
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
 <module name="hal" type="kernelmodedll" entrypoint="HalInitSystem" installbase="system32" installname="hal.dll">
 	<importlibrary base="hal" definition="../hal.pspec" />
 	<bootstrap installbase="$(CDOUTPUT)" nameoncd="hal.dll" />
@@ -31,3 +32,5 @@
 	</directory>
 
 </module>
+</group>
+