diff --git a/reactos/ntoskrnl/kd/kdinit.c b/reactos/ntoskrnl/kd/kdinit.c
index dfbb09f349d..6746593bb29 100644
--- a/reactos/ntoskrnl/kd/kdinit.c
+++ b/reactos/ntoskrnl/kd/kdinit.c
@@ -258,7 +258,11 @@ KdInitSystem(ULONG BootPhase,
         return TRUE;
     }
     else
-	KdpEnableSafeMem();
+    {
+#ifdef _M_IX86
+        KdpEnableSafeMem();
+#endif
+    }
 
     /* Call the Initialization Routines of the Registered Providers */
     KdpCallInitRoutine(BootPhase);
diff --git a/reactos/ntoskrnl/ntoskrnl-generic.rbuild b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
index 6856489d44e..fd1aa231725 100644
--- a/reactos/ntoskrnl/ntoskrnl-generic.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl-generic.rbuild
@@ -273,9 +273,11 @@
 		</directory>
 	</directory>
 	<directory name="kd">
-		<directory name="i386">
-			<file>kdmemsup.c</file>
-		</directory>
+		<if property="ARCH" value="i386">
+			<directory name="i386">
+				<file>kdmemsup.c</file>
+			</directory>
+		</if>
 	</directory>
 	<if property="_WINKD_" value="0">
 		<directory name="kdbg">