diff --git a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
index f28f8c9020..aad4cf191d 100644
--- a/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
+++ b/MdePkg/Library/BaseMemoryLibOptPei/BaseMemoryLibOptPei.inf
@@ -52,6 +52,7 @@
   Ia32/SetMem32.S
   Ia32/SetMem16.nasm
   Ia32/SetMem16.S
+  Ia32/SetMem.nasm
   Ia32/SetMem.S
   Ia32/CopyMem.S
   Ia32/ScanMem64.nasm
@@ -72,6 +73,7 @@
   Ia32/SetMem32.asm
   Ia32/SetMem16.nasm
   Ia32/SetMem16.asm
+  Ia32/SetMem.nasm
   Ia32/SetMem.asm
   Ia32/CopyMem.asm
   ScanMem64Wrapper.c
diff --git a/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.nasm b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.nasm
new file mode 100644
index 0000000000..4d2fc184d9
--- /dev/null
+++ b/MdePkg/Library/BaseMemoryLibOptPei/Ia32/SetMem.nasm
@@ -0,0 +1,52 @@
+;------------------------------------------------------------------------------
+;
+; 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:
+;
+;   SetMem.Asm
+;
+; Abstract:
+;
+;   SetMem function
+;
+; Notes:
+;
+;------------------------------------------------------------------------------
+
+    SECTION .text
+
+;------------------------------------------------------------------------------
+;  VOID *
+;  InternalMemSetMem (
+;    IN VOID   *Buffer,
+;    IN UINTN  Count,
+;    IN UINT8  Value
+;    )
+;------------------------------------------------------------------------------
+global ASM_PFX(InternalMemSetMem)
+ASM_PFX(InternalMemSetMem):
+    push    edi
+    mov         ecx, [esp + 12]
+    mov         al,  [esp + 16]
+    mov         ah,  al
+    shrd        edx, eax, 16
+    shld        eax, edx, 16
+    mov         edx, ecx
+    mov         edi, [esp + 8]
+    shr         ecx, 2
+    rep stosd
+    mov         ecx, edx
+    and         ecx, 3
+    rep stosb
+    mov         eax, [esp + 8]
+    pop     edi
+    ret
+