diff --git a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
index 5629a74656..1b0c3b36eb 100644
--- a/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
+++ b/MdeModulePkg/Universal/Disk/PartitionDxe/Partition.c
@@ -4,7 +4,7 @@
   of the raw block devices media. Currently "El Torito CD-ROM", Legacy
   MBR, and GPT partition schemes are supported.
 
-Copyright (c) 2006 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2010, 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
 which accompanies this distribution.  The full text of the license may be found at
@@ -658,6 +658,15 @@ PartitionInstallChildHandle (
 
   Private->Media.BlockSize      = (UINT32) BlockSize;
 
+  //
+  // Per UEFI Spec, LowestAlignedLba and LogicalBlocksPerPhysicalBlock must be 0
+  //  for logical partitions.
+  //
+  if (Private->BlockIo.Revision >= EFI_BLOCK_IO_PROTOCOL_REVISION2) {
+    Private->BlockIo.Media->LowestAlignedLba              = 0;
+    Private->BlockIo.Media->LogicalBlocksPerPhysicalBlock = 0;
+  }
+
   Private->BlockIo.Reset        = PartitionReset;
   Private->BlockIo.ReadBlocks   = PartitionReadBlocks;
   Private->BlockIo.WriteBlocks  = PartitionWriteBlocks;