diff --git a/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf b/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
index d8c58b0686..9dc2799cf0 100644
--- a/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
+++ b/Nt32Pkg/WinNtOemHookStatusCodeHandlerDxe/WinNtOemHookStatusCodeHandlerDxe.inf
@@ -2,7 +2,7 @@
 # OEM hook status code handler driver which produces general handler and hook it
 # onto the DXE status code router.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2011, 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
@@ -19,6 +19,7 @@
   BASE_NAME                      = WinNtOemHookStatusCodeHandlerDxe
   FILE_GUID                      = CA4233AD-847E-4E5D-AD3F-21CABFE5E23C
   MODULE_TYPE                    = DXE_DRIVER
+  VERSION_STRING                 = 1.0
   ENTRY_POINT                    = WinNtOemHookStatusCodeHandlerDxeEntry
 
 #
diff --git a/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf b/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
index 5d1ee68c3c..aa0a8977e2 100644
--- a/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
+++ b/Nt32Pkg/WinNtOemHookStatusCodeHandlerPei/WinNtOemHookStatusCodeHandlerPei.inf
@@ -2,7 +2,7 @@
 # OEM hook status code handler PEIM which produces general handler and hook it
 # onto the PEI status code router.
 #
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2007 - 2011, 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
@@ -20,6 +20,7 @@
   BASE_NAME                      = WinNtOemHookStatusCodeHandlerPei
   FILE_GUID                      = D233D6BD-F1B1-425A-BF45-5CAF2B88EDDC
   MODULE_TYPE                    = PEIM
+  VERSION_STRING                 = 1.0
   ENTRY_POINT                    = WinNtOemHookStatusCodeHandlerPeiEntry
 
 
diff --git a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
index 0e714c4268..519e8813d8 100644
--- a/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
+++ b/OptionRomPkg/CirrusLogic5430Dxe/CirrusLogic5430Dxe.inf
@@ -9,7 +9,7 @@
 #  requires both the UGA Draw and the UGA I/O Protocol. Please refer to Microsoft's
 #  documentation on UGA for details on how to write a UGA driver that is able
 #  to function both in the EFI pre-boot environment and from the OS runtime.
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2006 - 2011, 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
@@ -35,6 +35,7 @@
   PCI_CLASS_CODE = 0x030000
   PCI_REVISION   = 0x00
   COMPRESS       = TRUE
+  PCI_COMPRESS   = TRUE
 
 #
 # The following information is for reference only and not required by the build tools.
diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec
index f88215f434..17220f285d 100644
--- a/OvmfPkg/OvmfPkg.dec
+++ b/OvmfPkg/OvmfPkg.dec
@@ -14,7 +14,7 @@
 ##
 
 [Defines]
-  DEC_VERSION                    = 0x00010005
+  DEC_SPECIFICATION              = 0x00010005
   PACKAGE_NAME                   = OvmfPkg
   PACKAGE_GUID                   = 2daf5f34-50e5-4b9d-b8e3-5562334d87e5
   PACKAGE_VERSION                = 0.1
diff --git a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
index 6b19fb90c7..098a04d5cb 100644
--- a/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
+++ b/OvmfPkg/QemuVideoDxe/QemuVideoDxe.inf
@@ -2,7 +2,7 @@
 #  This driver is a sample implementation of the Graphics Output Protocol for
 #  the QEMU (Cirrus Logic 5446) video controller.
 #
-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2006 - 2011, 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
@@ -28,6 +28,7 @@
   PCI_CLASS_CODE = 0x030000
   PCI_REVISION   = 0x00
   COMPRESS       = TRUE
+  PCI_COMPRESS   = TRUE
 
 #
 # The following information is for reference only and not required by the build tools.
diff --git a/UnixPkg/UnixPkg.dec b/UnixPkg/UnixPkg.dec
index 65bb58de85..7f7d516b43 100644
--- a/UnixPkg/UnixPkg.dec
+++ b/UnixPkg/UnixPkg.dec
@@ -14,7 +14,7 @@
 ##
 
 [Defines]
-  DEC_VERSION                    = 0x00010005
+  DEC_SPECIFICATION              = 0x00010005
   PACKAGE_NAME                   = EdkUnixPkg
   PACKAGE_GUID                   = f2805c44-8985-11db-9e98-0040d02b1835
   PACKAGE_VERSION                = 0.1
diff --git a/UnixPkg/UnixSnpDxe/UnixSnpDxe.inf b/UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
index b8bdc2e2df..c73aeedb01 100644
--- a/UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
+++ b/UnixPkg/UnixSnpDxe/UnixSnpDxe.inf
@@ -2,6 +2,7 @@
 # Component name for module UnixSnpDxe
 #
 # Copyright (c) 2010, Apple, Inc. All rights reserved.<BR>
+# Copyright (c) 2011, 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
@@ -19,8 +20,6 @@
   FILE_GUID                      = 20BAF49B-036D-4CA6-8FAF-583ED2737F95
   MODULE_TYPE                    = UEFI_DRIVER
   VERSION_STRING                 = 1.0
-  EDK_RELEASE_VERSION            = 0x00020000
-  EFI_SPECIFICATION_VERSION      = 0x00020000
 
   ENTRY_POINT                    = InitializeUnixSnpDriver
 #  UNLOAD_IMAGE                   = UnixSnpUnload