diff --git a/include/libopencmsis/dispatch/irqhandlers.h b/include/libopencmsis/dispatch/irqhandlers.h
index 65e071d7..ad64306b 100644
--- a/include/libopencmsis/dispatch/irqhandlers.h
+++ b/include/libopencmsis/dispatch/irqhandlers.h
@@ -1,9 +1,15 @@
-#if defined(STM32F1)
+#if defined(STM32F0)
+#	include <libopencmsis/stm32/f0/irqhandlers.h>
+#elif defined(STM32F1)
 #	include <libopencmsis/stm32/f1/irqhandlers.h>
 #elif defined(STM32F2)
 #	include <libopencmsis/stm32/f2/irqhandlers.h>
+#elif defined(STM32F3)
+#	include <libopencmsis/stm32/f3/irqhandlers.h>
 #elif defined(STM32F4)
 #	include <libopencmsis/stm32/f4/irqhandlers.h>
+#elif defined(STM32L1)
+#	include <libopencmsis/stm32/l1/irqhandlers.h>
 
 #elif defined(EFM32TG)
 #	include <libopencmsis/efm32/efm32tg/irqhandlers.h>
@@ -14,8 +20,29 @@
 #elif defined(EFM32GG)
 #	include <libopencmsis/efm32/efm32gg/irqhandlers.h>
 
-#elif defined(LPC43XX)
-#	include <libopencmsis/lpc43xx/irqhandlers.h>
+#elif defined(LPC13XX)
+#       include <libopencmsis/lpc13xx/irqhandlers.h>
+#elif defined(LPC17XX)
+#       include <libopencmsis/lpc17xx/irqhandlers.h>
+#elif defined(LPC43XX_M4)
+#       include <libopencmsis/lpc43xx/m4/irqhandlers.h>
+#elif defined(LPC43XX_M0)
+#       include <libopencmsis/lpc43xx/m0/irqhandlers.h>
+
+#elif defined(SAM3A)
+#       include <libopencmsis/sam/3a/irqhandlers.h>
+#elif defined(SAM3N)
+#       include <libopencmsis/sam/3n/irqhandlers.h>
+#elif defined(SAM3S)
+#       include <libopencmsis/sam/3s/irqhandlers.h>
+#elif defined(SAM3U)
+#       include <libopencmsis/sam/3u/irqhandlers.h>
+#elif defined(SAM3X)
+#       include <libopencmsis/sam/3x/irqhandlers.h>
+
+#elif defined(LM3S) || defined(LM4F)
+/* Yes, we use the same interrupt table for both LM3S and LM4F */
+#	include <libopencmsis/lm3s/irqhandlers.h>
 
 #else
 #	warning"no chipset defined; user interrupts are not redirected"
diff --git a/scripts/irq2nvic_h b/scripts/irq2nvic_h
index 1fb48bdf..52f12653 100755
--- a/scripts/irq2nvic_h
+++ b/scripts/irq2nvic_h
@@ -103,7 +103,7 @@ template_cmsis_h = '''\
  * It was generated by the irq2nvic_h script.
  *
  * These definitions bend every interrupt handler that is defined CMSIS style
- * to the weak symbol exported by libopenmc3.
+ * to the weak symbol exported by libopencm3.
  */
 
 {cmsisbends}