diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index fbd4535d67..ec0753a984 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -537,6 +537,7 @@
   X64/ReadCs.asm | MSFT
   X64/WriteDr7.nasm| MSFT
   X64/WriteDr7.asm | MSFT
+  X64/WriteDr6.nasm| MSFT
   X64/WriteDr6.asm | MSFT
   X64/WriteDr5.asm | MSFT
   X64/WriteDr4.asm | MSFT
@@ -655,6 +656,7 @@
   X64/ReadCs.asm | INTEL
   X64/WriteDr7.nasm| INTEL
   X64/WriteDr7.asm | INTEL
+  X64/WriteDr6.nasm| INTEL
   X64/WriteDr6.asm | INTEL
   X64/WriteDr5.asm | INTEL
   X64/WriteDr4.asm | INTEL
diff --git a/MdePkg/Library/BaseLib/X64/WriteDr6.nasm b/MdePkg/Library/BaseLib/X64/WriteDr6.nasm
new file mode 100644
index 0000000000..fdf328edfd
--- /dev/null
+++ b/MdePkg/Library/BaseLib/X64/WriteDr6.nasm
@@ -0,0 +1,39 @@
+;------------------------------------------------------------------------------
+;
+; 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:
+;
+;   WriteDr6.Asm
+;
+; Abstract:
+;
+;   AsmWriteDr6 function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    DEFAULT REL
+    SECTION .text
+
+;------------------------------------------------------------------------------
+; UINTN
+; EFIAPI
+; AsmWriteDr6 (
+;   IN UINTN Value
+;   );
+;------------------------------------------------------------------------------
+global ASM_PFX(AsmWriteDr6)
+ASM_PFX(AsmWriteDr6):
+    mov     dr6, rcx
+    mov     rax, rcx
+    ret
+