diff --git a/MdePkg/Include/Protocol/Hii.h b/MdePkg/Include/Protocol/Hii.h
index 1de8dc3450..1fa0a2618c 100644
--- a/MdePkg/Include/Protocol/Hii.h
+++ b/MdePkg/Include/Protocol/Hii.h
@@ -3,7 +3,7 @@
   be used by resources which want to publish IFR/Font/String data and have it 
   collected by the Configuration engine.
 
-  Copyright (c) 2006, Intel Corporation                                                         
+  Copyright (c) 2006 - 2007, 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        
@@ -26,7 +26,7 @@
 
 #define EFI_HII_PROTOCOL_GUID \
   { \
-    0xea816d2c, 0xcee5, 0x4f02, {0x99, 0xb5, 0xd3, 0x90, 0x5c, 0xbb, 0xd0, 0x77 } \
+    0xd7ad636e, 0xb997, 0x459b, {0xbf, 0x3f, 0x88, 0x46, 0x89, 0x79, 0x80, 0xe1} \
   }
 
 // BugBug:
diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 329ef245df..a7d6adae6e 100644
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -7,13 +7,13 @@
     <Abstract>Framework Module Development Environment Industry Standards</Abstract>
     <Description>This Package provides headers and libraries that conform to EFI/Framework Industry standards.</Description>
     <Copyright>Copyright (c) 2006 - 2007, Intel Corporation.</Copyright>
-    <License>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
-      http://opensource.org/licenses/bsd-license.php
-
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <License>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
+      http://opensource.org/licenses/bsd-license.php
+
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </SpdHeader>
@@ -1620,7 +1620,7 @@
     </Entry>
     <Entry Name="Hii">
       <C_Name>gEfiHiiProtocolGuid</C_Name>
-      <GuidValue>EA816D2C-CEE5-4F02-99B5-D3905CBBD077</GuidValue>
+      <GuidValue>D7AD636E-B997-459B-BF3F-8846897980E1</GuidValue>
       <HelpText/>
     </Entry>
     <Entry Name="PcdProtocol">
@@ -2219,8 +2219,8 @@
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
-                number of characters (not counting the NULL-terminator) in a
+      <HelpText>If PcdMaximumUnicodeStringLength is not zero, the maximum
+                number of characters (not counting the NULL-terminator) in a
                 Unicode string cannot exceed it.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2230,8 +2230,8 @@
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
-                of characters (not counting the NULL-terminator) in an ASCII
+      <HelpText>If PcdMaximumAsciiStringLength is not zero, the maximum number
+                of characters (not counting the NULL-terminator) in an ASCII
                 string cannot exceed it.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2241,8 +2241,8 @@
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>1000000</DefaultValue>
-      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
-                of nodes (not counting the list header) in a linked list
+      <HelpText>If PcdMaximumLinkedListLength is not zero, the maximum number
+                of nodes (not counting the list header) in a linked list
                 cannot exceed it.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2252,7 +2252,7 @@
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>10000000</DefaultValue>
-      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
+      <HelpText>If PcdSpinLockTimeout is not zero, it stands for the timeout
                 value (unit: millisecond) for spin lock.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2262,8 +2262,8 @@
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x0f</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of Debug
-                Assert, Debug Print, Debug Code, Clear Memory, Assert
+      <HelpText>The bitmask of flags that specify the enable/disable of Debug
+                Assert, Debug Print, Debug Code, Clear Memory, Assert
                 Breakpoint and Assert Deadloop.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2273,7 +2273,7 @@
       <DatumType>UINT32</DatumType>
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
       <DefaultValue>0x80000000</DefaultValue>
-      <HelpText>The bitmask of flags that specify the kind of debug message
+      <HelpText>The bitmask of flags that specify the kind of debug message
                 output when Debug Print is enabled.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2283,7 +2283,7 @@
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0x06</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of
+      <HelpText>The bitmask of flags that specify the enable/disable of
                 Progress Code, Error Code and Debug Code.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2293,7 +2293,7 @@
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0xAF</DefaultValue>
-      <HelpText>The value used by DebugClearMemory () to fill a certain range
+      <HelpText>The value used by DebugClearMemory () to fill a certain range
                 of memory.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2303,7 +2303,7 @@
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of
+      <HelpText>The bitmask of flags that specify the enable/disable of
                 Performance Measurement.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -2313,7 +2313,7 @@
       <DatumType>UINT8</DatumType>
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>
       <DefaultValue>0</DefaultValue>
-      <HelpText>The bitmask of flags that specify the enable/disable of Post
+      <HelpText>The bitmask of flags that specify the enable/disable of Post
                 Code, Post Code Description.</HelpText>
     </PcdEntry>
     <PcdEntry>