diff --git a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
index bf76f35fa3..e47b662625 100644
--- a/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
+++ b/UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf
@@ -3,14 +3,17 @@
 #
 # Timer Library that only uses CPU resources to provide calibrated delays
 #  on IA-32, x64, and IPF.
-# Note: Because CPU Local APIC and ITC could be programmed by OS, it cannot be
+# Note: A driver of type DXE_RUNTIME_DRIVER and DXE_SMM_DRIVER can use this TimerLib 
+#  in their initialization without any issues. They only have to be careful in 
+#  the implementation of runtime services and SMI handlers.  
+#  Because CPU Local APIC and ITC could be programmed by OS, it cannot be
 #  used by SMM drivers and runtime drivers, ACPI timer is recommended for SMM
 #  drivers and runtime drivers.
 #
 # This library differs with the SecPeiDxeTimerLibCpu library in the MdePkg in
 # that it uses the local APIC library so that it supports x2APIC mode.
 #
-# Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2010 - 2011, 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
@@ -28,7 +31,7 @@
   FILE_GUID                      = 4FFF2014-2086-4ee6-9B58-886D1967861C
   MODULE_TYPE                    = BASE
   VERSION_STRING                 = 1.0
-  LIBRARY_CLASS                  = TimerLib|BASE DXE_CORE DXE_DRIVER DXE_SAL_DRIVER PEIM PEI_CORE SEC UEFI_APPLICATION UEFI_DRIVER
+  LIBRARY_CLASS                  = TimerLib
 
 
 #