diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index 7673a30730..76e0e9898a 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -327,5 +327,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   }
 
-  #FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+  FatPkg/EnhancedFatDxe/Fat.inf
+!endif
 
diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index 22c134f9a0..9548541442 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -247,8 +247,11 @@ INF  UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
 #
 # Build from source or use checked in binary
 #
-#INF FatPkg/EnhancedFatDxe/Fat.inf
+!if $(COMPILE_BINS)
+INF FatPkg/EnhancedFatDxe/Fat.inf
+!else
 INF  RuleOverride = BINARY USE = IA32 FatBinPkg/EnhancedFatDxe/Fat.inf
+!endif
 
 # If  you build GccShellPkg you can source level debug shell
 #FILE APPLICATION = PCD(gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile) {
diff --git a/UnixPkg/UnixPkgX64.dsc b/UnixPkg/UnixPkgX64.dsc
index 95a78773c7..2ff5b9d534 100644
--- a/UnixPkg/UnixPkgX64.dsc
+++ b/UnixPkg/UnixPkgX64.dsc
@@ -328,5 +328,7 @@
       PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   }
 
+!if $(COMPILE_BINS)
   FatPkg/EnhancedFatDxe/Fat.inf
+!endif
 !endif