diff --git a/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h b/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
index 7159588ee1..9379086ba4 100644
--- a/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
+++ b/EdkCompatibilityPkg/Foundation/Include/EfiCompNameSupport.h
@@ -1,6 +1,6 @@
 /*++
 
-Copyright (c) 2004, Intel Corporation                                                         
+Copyright (c) 2004 - 2008, Intel Corporation                                                         
 All rights reserved. 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        
@@ -40,6 +40,21 @@ Abstract:
                                          (ComponentName),       \
                                          (DriverConfiguration), \
                                          (DriverDiagnostics))
+
+#define INSTALL_ALL_DRIVER_PROTOCOLS2(ImageHandle,              \
+                                     SystemTable,               \
+                                     DriverBinding,             \
+                                     DriverBindingHandle,       \
+                                     ComponentName,             \
+                                     DriverConfiguration,       \
+                                     DriverDiagnostics)         \
+        EfiLibInstallAllDriverProtocols2((ImageHandle),         \
+                                         (SystemTable),         \
+                                         (DriverBinding),       \
+                                         (DriverBindingHandle), \
+                                         (ComponentName),       \
+                                         (DriverConfiguration), \
+                                         (DriverDiagnostics))
 #else
 
 #define INSTALL_ALL_DRIVER_PROTOCOLS(ImageHandle,             \
@@ -53,6 +68,53 @@ Abstract:
                                     (SystemTable),            \
                                     (DriverBinding),          \
                                     (DriverBindingHandle))
+
+#define INSTALL_ALL_DRIVER_PROTOCOLS2(ImageHandle,            \
+                                     SystemTable,             \
+                                     DriverBinding,           \
+                                     DriverBindingHandle,     \
+                                     ComponentName,           \
+                                     DriverConfiguration,     \
+                                     DriverDiagnostics)       \
+        EfiLibInstallDriverBinding ((ImageHandle),            \
+                                    (SystemTable),            \
+                                    (DriverBinding),          \
+                                    (DriverBindingHandle))
 #endif
 
+#if (EFI_SPECIFICATION_VERSION < 0x00020000)
+
+#define INSTALL_ALL_DRIVER_PROTOCOLS_OR_PROTOCOLS2(ImageHandle,    \
+                                             SystemTable,          \
+                                             DriverBinding,        \
+                                             DriverBindingHandle,  \
+                                             ComponentName,        \
+                                             DriverConfiguration,  \
+                                             DriverDiagnostics)    \
+        INSTALL_ALL_DRIVER_PROTOCOLS       ((ImageHandle),         \
+                                            (SystemTable),         \
+                                            (DriverBinding),       \
+                                            (DriverBindingHandle), \
+                                            (ComponentName),       \
+                                            (DriverConfiguration), \
+                                            (DriverDiagnostics))
+
+#else
+
+#define INSTALL_ALL_DRIVER_PROTOCOLS_OR_PROTOCOLS2(ImageHandle,    \
+                                             SystemTable,          \
+                                             DriverBinding,        \
+                                             DriverBindingHandle,  \
+                                             ComponentName,        \
+                                             DriverConfiguration,  \
+                                             DriverDiagnostics)    \
+        INSTALL_ALL_DRIVER_PROTOCOLS2      ((ImageHandle),         \
+                                            (SystemTable),         \
+                                            (DriverBinding),       \
+                                            (DriverBindingHandle), \
+                                            (ComponentName),       \
+                                            (DriverConfiguration), \
+                                            (DriverDiagnostics))
+
+#endif
 #endif