diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index caf8de11e5..b577de263c 100644
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -1,7 +1,7 @@
 ## @file
 # process FV image section generation
 #
-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -83,6 +83,24 @@ class FvImageSection(FvImageSectionClassObject):
             else:
                 if self.FvFileName != None:
                     FvFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(self.FvFileName)
+                    if os.path.isfile(FvFileName):
+                        FvFileObj = open (FvFileName,'r+b')
+                        FvFileObj.seek(0)
+                        # PI FvHeader is 0x48 byte
+                        FvHeaderBuffer = FvFileObj.read(0x48)
+                        # FV alignment position.
+                        FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)
+                        # FvAlignmentValue is larger than or equal to 1K
+                        if FvAlignmentValue >= 0x400:
+                            if FvAlignmentValue >= 0x10000:
+                                #The max alignment supported by FFS is 64K.
+                                self.Alignment = "64K"
+                            else:
+                                self.Alignment = str (FvAlignmentValue / 0x400) + "K"
+                        else:
+                            # FvAlignmentValue is less than 1K
+                            self.Alignment = str (FvAlignmentValue)
+                        FvFileObj.close()
                 else:
                     EdkLogger.error("GenFds", GENFDS_ERROR, "FvImageSection Failed! %s NOT found in FDF" % self.FvName)