diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.S b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.S
index 0f3abbd789..640f07a1af 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/Ia32/Thunk16.S
@@ -1,6 +1,6 @@
 #*****************************************************************************
 #*
-#*   Copyright (c) 2006 - 2007, Intel Corporation                                                         
+#*   Copyright (c) 2006 - 2009, 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        
@@ -51,7 +51,6 @@ _16Gdtr:
 
 
 .text
-.align  16
 
 
 ASM_PFX(Thunk16):
diff --git a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.S b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.S
index 26709e61b0..b4ed1d5111 100644
--- a/EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.S
+++ b/EdkCompatibilityPkg/Foundation/Library/Thunk16/X64/Thunk16.S
@@ -1,6 +1,6 @@
 #*****************************************************************************
 #*
-#*   Copyright (c) 2008, Intel Corporation                                                         
+#*   Copyright (c) 2008 - 2009, 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        
@@ -166,7 +166,7 @@ Label:
       retq   
 
 
-    .align 0x10
+    .p2align 4
 
 _Code16Addr:
 ASM_PFX(RealMode):