diff --git a/ShellBinPkg/MinUefiShell/Ia32/Shell.efi b/ShellBinPkg/MinUefiShell/Ia32/Shell.efi
index 83e03eb356..138f2d07aa 100644
Binary files a/ShellBinPkg/MinUefiShell/Ia32/Shell.efi and b/ShellBinPkg/MinUefiShell/Ia32/Shell.efi differ
diff --git a/ShellBinPkg/MinUefiShell/X64/Shell.efi b/ShellBinPkg/MinUefiShell/X64/Shell.efi
index 1b8515223a..92f6122d54 100644
Binary files a/ShellBinPkg/MinUefiShell/X64/Shell.efi and b/ShellBinPkg/MinUefiShell/X64/Shell.efi differ
diff --git a/ShellBinPkg/ReadMe.txt b/ShellBinPkg/ReadMe.txt
index 2e3355b3e7..15d51016d8 100644
--- a/ShellBinPkg/ReadMe.txt
+++ b/ShellBinPkg/ReadMe.txt
@@ -2,7 +2,7 @@
                                  OVERVIEW
 ============================================================================
 The binaries of ShellBinPkg are generated with ShellPkg project and built with 
-BaseTools Package (r16473). The binaries are built with no debug information 
+BaseTools Package (r17584). The binaries are built with no debug information 
 by building with "RELEASE" target.
 
 The following steps can help to re-generate these binaries for customization:
diff --git a/ShellBinPkg/UefiShell/Ia32/Shell.efi b/ShellBinPkg/UefiShell/Ia32/Shell.efi
index 08693063e1..9a422ea2a0 100644
Binary files a/ShellBinPkg/UefiShell/Ia32/Shell.efi and b/ShellBinPkg/UefiShell/Ia32/Shell.efi differ
diff --git a/ShellBinPkg/UefiShell/X64/Shell.efi b/ShellBinPkg/UefiShell/X64/Shell.efi
index 50746f14b3..3f7093cbd0 100644
Binary files a/ShellBinPkg/UefiShell/X64/Shell.efi and b/ShellBinPkg/UefiShell/X64/Shell.efi differ