diff --git a/include/libopencm3/cm3/itm.h b/include/libopencm3/cm3/itm.h
index dc711a0e..bb7a5f17 100644
--- a/include/libopencm3/cm3/itm.h
+++ b/include/libopencm3/cm3/itm.h
@@ -27,8 +27,8 @@
  */
 
 /* Those defined only on ARMv7 and above */
-#if !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7EM__)
-#error "Instrumentation Trace Macrocell not available in CM0"
+#if !defined(__ARM_ARCH_7M__) && !defined(__ARM_ARCH_7EM__) && !defined(__ARM_ARCH_8M_MAIN__)
+#error "Instrumentation Trace Macrocell not available in CM0 or CM23"
 #endif
 
 /* --- ITM registers ------------------------------------------------------- */
diff --git a/include/libopencm3/cm3/memorymap.h b/include/libopencm3/cm3/memorymap.h
index 954328ab..909136e2 100644
--- a/include/libopencm3/cm3/memorymap.h
+++ b/include/libopencm3/cm3/memorymap.h
@@ -26,7 +26,7 @@
 #define PPBI_BASE                       (0xE0000000U)
 
 /* Those defined only on ARMv7 and above */
-#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__)
+#if defined(__ARM_ARCH_7M__) || defined(__ARM_ARCH_7EM__) || defined(__ARM_ARCH_8M_MAIN__)
 /* ITM: Instrumentation Trace Macrocell */
 #define ITM_BASE                        (PPBI_BASE + 0x0000)