diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 5eb96d2658..7deeb01b41 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -291,6 +291,7 @@
   Ia32/ReadCr2.asm | INTEL 
   Ia32/ReadCr0.nasm| INTEL
   Ia32/ReadCr0.asm | INTEL 
+  Ia32/Mwait.nasm| INTEL
   Ia32/Mwait.asm | INTEL 
   Ia32/Monitor.asm | INTEL 
   Ia32/ModU64x32.asm | INTEL 
@@ -334,6 +335,7 @@
   Ia32/EnablePaging64.S | GCC 
   Ia32/DisablePaging32.S | GCC 
   Ia32/EnablePaging32.S | GCC 
+  Ia32/Mwait.nasm| GCC
   Ia32/Mwait.S | GCC 
   Ia32/Monitor.S | GCC 
   Ia32/CpuIdEx.S | GCC 
diff --git a/MdePkg/Library/BaseLib/Ia32/Mwait.nasm b/MdePkg/Library/BaseLib/Ia32/Mwait.nasm
new file mode 100644
index 0000000000..704b569573
--- /dev/null
+++ b/MdePkg/Library/BaseLib/Ia32/Mwait.nasm
@@ -0,0 +1,40 @@
+;------------------------------------------------------------------------------
+;
+; Copyright (c) 2006, 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
+; 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.
+;
+; Module Name:
+;
+;   Mwait.Asm
+;
+; Abstract:
+;
+;   AsmMwait function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINTN
+; EFIAPI
+; AsmMwait (
+;   IN      UINTN                     Eax,
+;   IN      UINTN                     Ecx
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmMwait)
+ASM_PFX(AsmMwait):
+    mov     eax, [esp + 4]
+    mov     ecx, [esp + 8]
+    DB      0xf, 1, 0xc9                ; mwait
+    ret
+