diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 5914b05d7d..a55bc86bd9 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -40,6 +40,8 @@
 [PcdsFeatureFlag.common]
   PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid|FALSE
   PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid|FALSE
+  PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|FALSE
+  PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|FALSE
 
 [PcdsFixedAtBuild.common]
   PcdMaximumUnicodeStringLength|gEfiMdePkgTokenSpaceGuid|1000000