diff --git a/EdkFatBinPkg/Fat.msa b/EdkFatBinPkg/Fat.msa
index cbbb6614ac..a0bec63476 100644
--- a/EdkFatBinPkg/Fat.msa
+++ b/EdkFatBinPkg/Fat.msa
@@ -10,7 +10,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
 <ModuleSurfaceArea  xmlns="http://www.TianoCore.org/2006/Edk2.0">
   <MsaHeader>
     <ModuleName>Fat</ModuleName>
-    <ModuleType>PEIM</ModuleType>
+    <ModuleType>USER_DEFINED</ModuleType>
     <GuidValue>5058F21C-BC34-11d4-BD18-0080C73C8881</GuidValue>
     <Version>1.0</Version>
     <Abstract>Make a FFS section for an FV that contains the FAT driver.*.FFS files are compressed FFS sections.</Abstract>
@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <OutputFileBasename>Fat</OutputFileBasename>
   </ModuleDefinitions>
   <SourceFiles>
+    <Filename ToolCode="DUMMY">Fat_build.xml</Filename>
     <Filename SupArchList="IA32">Ia32/Fat.FFS</Filename>
     <Filename SupArchList="IPF">Ipf/Fat.FFS</Filename>
     <Filename SupArchList="X64">X64/Fat.FFS</Filename>
diff --git a/EdkFatBinPkg/Fat_build.xml b/EdkFatBinPkg/Fat_build.xml
index e99c13ffac..4eb2677c7a 100644
--- a/EdkFatBinPkg/Fat_build.xml
+++ b/EdkFatBinPkg/Fat_build.xml
@@ -30,7 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
   <target name="output">
     <copy file="${MODULE_DIR}\${ARCH}\${BASE_NAME}.FFS" 
-      tofile="${BIN_DIR}\${FILE_GUID}-${BASE_NAME}.DXE" />
+      tofile="${BIN_DIR}\${FILE_GUID}-${BASE_NAME}.FFS" />
   </target>
     
 </project>