diff --git a/EdkFatBinPkg/Fat_build.xml b/EdkFatBinPkg/Fat_build.xml
index 23bcb65c36..74695b83f4 100644
--- a/EdkFatBinPkg/Fat_build.xml
+++ b/EdkFatBinPkg/Fat_build.xml
@@ -21,8 +21,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   
   <!-- Default target -->
   <target name="main">
-    <copy file="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS" 
-      tofile="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS" />
+    <OnDependency>
+      <sourcefiles>
+        <file name="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS"/>
+      </sourcefiles>
+      <targetfiles>
+        <file name="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS"/>
+      </targetfiles>
+      <sequential>
+        <copy file="${MODULE_DIR}/${ARCH}/${BASE_NAME}.FFS" tofile="${BIN_DIR}/${FILE_GUID}-${BASE_NAME}.FFS" />
+      </sequential>
+    </OnDependency>
   </target>
 
   <target name="clean">
diff --git a/EdkFatBinPkg/Ia32/Fat.FFS b/EdkFatBinPkg/Ia32/Fat.FFS
index 7d50bac4e8..41c64abe2f 100644
Binary files a/EdkFatBinPkg/Ia32/Fat.FFS and b/EdkFatBinPkg/Ia32/Fat.FFS differ
diff --git a/EdkFatBinPkg/X64/Fat.FFS b/EdkFatBinPkg/X64/Fat.FFS
index e3103f2839..786c6d3c96 100644
Binary files a/EdkFatBinPkg/X64/Fat.FFS and b/EdkFatBinPkg/X64/Fat.FFS differ
diff --git a/EdkNt32Pkg/Logo/Logo_build.xml b/EdkNt32Pkg/Logo/Logo_build.xml
index 1706b5371e..6096015be5 100644
--- a/EdkNt32Pkg/Logo/Logo_build.xml
+++ b/EdkNt32Pkg/Logo/Logo_build.xml
@@ -20,31 +20,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <property name="BASE_NAME" value="Logo" /> 
   
   <!-- Default target --> 
-  <target name="main" depends="sourcefiles, sections, output" /> 
-
-  <target name="sourcefiles">
-    <copy file="${MODULE_DIR}/Logo.bmp" 
-      tofile="${DEST_DIR_OUTPUT}/Logo.bmp" />
-  </target>
+  <target name="main" depends="sections, output" /> 
   
   <target name="sections">
     <OnDependency>
       <sourcefiles>
-        <file name="${DEST_DIR_OUTPUT}/logo.bmp"/>
+        <file name="${MODULE_DIR}/logo.bmp"/>
       </sourcefiles>
       <targetfiles>
         <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>
       </targetfiles>
       
       <sequential>
-        <gensection inputfile="${DEST_DIR_OUTPUT}/logo.bmp" 
+        <gensection inputfile="${MODULE_DIR}/logo.bmp" 
           outputfile="${DEST_DIR_OUTPUT}/Logo.sec" 
           sectiontype="EFI_SECTION_RAW" />
       </sequential>
     </OnDependency>
   </target>
 
-  <target name="output">
+  <target name="output" depends="sections">
     <OnDependency>
       <sourcefiles>
         <file name="${DEST_DIR_OUTPUT}/Logo.sec"/>