diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
index 308fc08c6e..a8a9dcd68c 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PcatSingleSegmentPciCfg2Pei.inf
@@ -3,7 +3,7 @@
 #  to provide read, write and modify access to Pci configuration space in PEI phase. 
 #  To follow PI specification, these services also support access to the unaligned Pci address.
 #
-#  Copyright (c) 2006 - 2008, Intel Corporation
+#  Copyright (c) 2006 - 2010, Intel Corporation
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -22,7 +22,6 @@
   MODULE_TYPE                    = PEIM
   VERSION_STRING                 = 1.0
   ENTRY_POINT                    = PeimInitializePciCfg
-  PI_SPECIFICATION_VERSION       = 0x00010000
 
 #
 # The following information is for reference only and not required by the build tools.
@@ -42,7 +41,7 @@
   PciLib
   BaseLib
   DebugLib
-
+  PeiServicesLib
 
 [Ppis]
   gEfiPciCfg2PpiGuid                   ## PRODUCED
diff --git a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
index d2ca19c7b0..32dc96e249 100644
--- a/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
+++ b/MdeModulePkg/Universal/PcatSingleSegmentPciCfg2Pei/PciCfg2.c
@@ -3,7 +3,7 @@
   to provide read, write and modify access to Pci configuration space in PEI phase. 
   To follow PI specification, these services also support access to the unaligned Pci address.
 
-  Copyright (c) 2006 - 2008, Intel Corporation
+  Copyright (c) 2006 - 2010, Intel Corporation
   All rights reserved. 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
@@ -20,6 +20,7 @@
 #include <Library/DebugLib.h>
 #include <Library/PciLib.h>
 #include <Library/PeimEntryPoint.h>
+#include <Library/PeiServicesLib.h>
 #include <IndustryStandard/Pci.h>
 
 /**
@@ -308,10 +309,9 @@ PeimInitializePciCfg (
 {
   EFI_STATUS            Status;
 
-  ASSERT ((**PeiServices).Hdr.Revision >= PI_SPECIFICATION_VERSION);
-
   (**(EFI_PEI_SERVICES **)PeiServices).PciCfg = &gPciCfg2Ppi;
-  Status = (**PeiServices).InstallPpi (PeiServices, &gPciCfg2PpiList);
+  Status = PeiServicesInstallPpi (&gPciCfg2PpiList);
+  ASSERT_EFI_ERROR (Status);
 
   return Status;
 }
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index 77c6ff984f..40030be196 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -150,13 +150,11 @@ typedef struct {
 //
 #define EXPRESSION_STACK_SIZE_INCREMENT    0x100
 
+#define EFI_SPECIFICATION_MAJOR_VERSION    0x2
+#define EFI_SPECIFICATION_MINOR_VERSION    0x1
+#define EFI_SPECIFICATION_ERRATA_VERSION   0x0
+#define EFI_IFR_SPECIFICATION_VERSION  (UINT16)((EFI_SPECIFICATION_MAJOR_VERSION << 8) | (EFI_SPECIFICATION_MINOR_VERSION << 4) | EFI_SPECIFICATION_ERRATA_VERSION)
 
-#define EFI_SPECIFICATION_ERRATA_VERSION   0
-
-#define EFI_IFR_SPECIFICATION_VERSION  \
-        ((((EFI_SPECIFICATION_VERSION) >> 8) & 0xff00) | \
-         (((EFI_SPECIFICATION_VERSION) & 0xf) << 4) | \
-         ((EFI_SPECIFICATION_ERRATA_VERSION) & 0xf))
 
 #define SETUP_DRIVER_SIGNATURE SIGNATURE_32 ('F', 'B', 'D', 'V')
 typedef struct {
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 77b0d528c7..864a9a173f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,7 +1,7 @@
 #/** @file
 # The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.
 #
-# Copyright (c) 2007 - 2009, Intel Corporation. All rights reserved.
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.
 #
 #  All rights reserved. This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -20,7 +20,6 @@
   FILE_GUID                      = EBf342FE-B1D3-4EF8-957C-8048606FF671
   MODULE_TYPE                    = DXE_DRIVER
   VERSION_STRING                 = 1.0
-  EFI_SPECIFICATION_VERSION      = 0x0002000A
   ENTRY_POINT                    = InitializeSetup
 
 #