diff --git a/default.xml b/default.xml
index e04d44c..c05f815 100644
--- a/default.xml
+++ b/default.xml
@@ -20,10 +20,6 @@
            sync-c="true"
            sync-j="4" />
 
-  <project path="build" name="android_build" remote="omnirom" revision="android-6.0" groups="pdk" >
-    <copyfile src="core/root.mk" dest="Makefile" />
-  </project>
-
   <project path="android" name="android" remote="omnirom" revision="android-6.0" />
   <!-- project path="abi/cpp" name="platform/abi/cpp" groups="pdk" /> -->
   <!-- project path="art" name="android_art" remote="omnirom" revision="android-6.0" groups="pdk" /> -->
diff --git a/fox.xml b/fox.xml
index 0a9a8a2..24309fa 100644
--- a/fox.xml
+++ b/fox.xml
@@ -3,6 +3,9 @@
     <remote name="fox"
             fetch="https://gitlab.com/OrangeFox" />
 
+    <remote name="fox-unofficial"
+            fetch="https://github.com/OrangeFoxRecovery" />
+
     <remote name="LineageOS"
             fetch="https://github.com/LineageOS"
             review="https://review.lineageos.org" />
@@ -10,6 +13,11 @@
 <!-- OrangeFox lives in fox fox_9.0 -->
     <project path="bootable/recovery" name="bootable/Recovery" remote="fox" revision="fox_9.0" />
     <project path="vendor/recovery" name="vendor/recovery" remote="fox" revision="master" />
+   
+<!-- Use the Patched Build System for OrangeFox -->
+  <project path="build" name="fox-6.0_build" remote="fox-unofficial" revision="fox_6.0" >
+    <copyfile src="core/root.mk" dest="Makefile" />
+  </project>
 
 <!-- Include external LineageOS repos for bash & nano -->
     <project name="android_external_bash" path="external/bash" remote="LineageOS" revision="cm-13.0" />