diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 0877cff1cc..29baded2df 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -475,6 +475,7 @@
   X64/ReadTsc.asm | MSFT
   X64/WriteMm7.nasm| MSFT
   X64/WriteMm7.asm | MSFT
+  X64/WriteMm6.nasm| MSFT
   X64/WriteMm6.asm | MSFT
   X64/WriteMm5.asm | MSFT
   X64/WriteMm4.asm | MSFT
@@ -562,6 +563,7 @@
   X64/ReadTsc.asm | INTEL
   X64/WriteMm7.nasm| INTEL
   X64/WriteMm7.asm | INTEL
+  X64/WriteMm6.nasm| INTEL
   X64/WriteMm6.asm | INTEL
   X64/WriteMm5.asm | INTEL
   X64/WriteMm4.asm | INTEL
diff --git a/MdePkg/Library/BaseLib/X64/WriteMm6.nasm b/MdePkg/Library/BaseLib/X64/WriteMm6.nasm
new file mode 100644
index 0000000000..d4b2cda535
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/WriteMm6.nasm
@@ -0,0 +1,41 @@
+;------------------------------------------------------------------------------
+;
+; 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:
+;
+;   WriteMm6.Asm
+;
+; Abstract:
+;
+;   AsmWriteMm6 function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    DEFAULT REL
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; VOID
+; EFIAPI
+; AsmWriteMm6 (
+;   IN UINT64   Value
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmWriteMm6)
+ASM_PFX(AsmWriteMm6):
+    ;
+    ; 64-bit MASM doesn't support MMX instructions, so use opcode here
+    ;
+    DB      0x48, 0xf, 0x6e, 0xf1
+    ret
+