diff --git a/IntelFrameworkModulePkg/Include/Common/MaxBbsEntries.h b/IntelFrameworkModulePkg/Include/Common/MaxBbsEntries.h
index 7a0802012f..820c1d530b 100644
--- a/IntelFrameworkModulePkg/Include/Common/MaxBbsEntries.h
+++ b/IntelFrameworkModulePkg/Include/Common/MaxBbsEntries.h
@@ -15,6 +15,10 @@ Intel Corporation.
 #ifndef _MAX_BBS_ENTRIES_H
 #define _MAX_BBS_ENTRIES_H
 
+//
+// BUGBUG: This entry maybe changed to PCD in future and wait for
+//         redesign of BDS library
+//
 #define MAX_BBS_ENTRIES 0x100
 
 #endif