diff --git a/Changelog.md b/Changelog.md
index c9820ae9a46921360d1a0c1cefa444137f625279..d4a62a4d24f75fc232065ad8e35c9e6354f38367 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,8 +32,9 @@ OpenCore Changelog
 - Renamed `Block` to `Delete` in `ACPI`,`DeviceProperties`, and `NVRAM`
 - Added MacBookPro16,2 and MacBookPro16,3 model codes
 - Added PCI device scanning policy support (e.g. VIRTIO)
-- AudioDxe: Playback performance improvements
-- DataBase: Update builtin firmware versions
+- Improved playback performance in AudioDxe
+- Updated builtin firmware versions for SMBIOS and the rest
+- Added improved CPU type detection for newer CPU types
 
 #### v0.5.8
 - Fixed invalid CPU object reference in SSDT-PLUG
diff --git a/Include/Apple/IndustryStandard/AppleMachoImage.h b/Include/Apple/IndustryStandard/AppleMachoImage.h
index 49b7da08da506da0bbf3b8d40e7778e808d59fab..09364b542ded94fce03a601c326ac1350b6cfcc6 100644
--- a/Include/Apple/IndustryStandard/AppleMachoImage.h
+++ b/Include/Apple/IndustryStandard/AppleMachoImage.h
@@ -262,6 +262,7 @@ enum {
   MachCpuFamilyIntelKabyLake    = 0x0F817246,
   MachCpuFamilyIntelCoffeeLake  = MachCpuFamilyIntelKabyLake,
   MachCpuFamilyIntelIceLake     = 0x38435547,
+  MachCpuFamilyIntelCometLake   = 0x1CF8A03E,
   //
   // The following synonyms are deprecated:
   //
diff --git a/Include/Intel/IndustryStandard/ProcessorInfo.h b/Include/Intel/IndustryStandard/ProcessorInfo.h
index 4160ce19e877d1a6cd5639eb85b9961c4ef84c06..0feaa1c81039072fa98cea66ee22a2dd89811dbf 100755
--- a/Include/Intel/IndustryStandard/ProcessorInfo.h
+++ b/Include/Intel/IndustryStandard/ProcessorInfo.h
@@ -188,6 +188,12 @@ enum {
 #define CPU_MODEL_COFFEELAKE_ULT 0x9E
 #define CPU_MODEL_COFFEELAKE_ULX 0x9E
 #define CPU_MODEL_COFFEELAKE_DT  0x9E
+#define CPU_MODEL_ICELAKE_Y      0x7D
+#define CPU_MODEL_ICELAKE_U      0x7E
+#define CPU_MODEL_ICELAKE_SP     0x9F /* Some variation of Ice Lake */
+#define CPU_MODEL_COMETLAKE_S    0xA5 /* desktop CometLake */
+#define CPU_MODEL_COMETLAKE_Y    0xA5 /* aka 10th generation Amber Lake Y */
+#define CPU_MODEL_COMETLAKE_U    0xA6
 
 #define CPU_SOCKET_UNKNOWN  0x02
 #define CPU_SOCKET_PGA478   0x0F
diff --git a/Library/OcCpuLib/AppleCpuSupport.c b/Library/OcCpuLib/AppleCpuSupport.c
index 6fba3bc3660f7c813f3dcdc733816a02b9aab5fb..dc6c67bd6fa6409298f6fbba0404cdf8a44f9519 100644
--- a/Library/OcCpuLib/AppleCpuSupport.c
+++ b/Library/OcCpuLib/AppleCpuSupport.c
@@ -509,6 +509,11 @@ InternalDetectAppleProcessorType (
     //
     case CPU_MODEL_KABYLAKE:       // 0x8E
     case CPU_MODEL_COFFEELAKE:     // 0x9E
+    case CPU_MODEL_COMETLAKE_S:    // 0xA5 FIXME - unknown, for now
+    case CPU_MODEL_COMETLAKE_U:    // 0xA6 FIXME - unknown, for now
+    case CPU_MODEL_ICELAKE_Y:      // 0x7D FIXME - unknown, for now
+    case CPU_MODEL_ICELAKE_U:      // 0x7E FIXME - unknown, for now
+    case CPU_MODEL_ICELAKE_SP:     // 0x9F FIXME - unknown, for now
       if (AppleMajorType == AppleProcessorMajorM3) {
         // MB101 (m3 7Y32)
         return AppleProcessorTypeCoreM3Type7; // 0x0C07