diff --git a/include/libopencm3/dispatch/nvic.h b/include/libopencm3/dispatch/nvic.h
index d8e7889a..441fd285 100644
--- a/include/libopencm3/dispatch/nvic.h
+++ b/include/libopencm3/dispatch/nvic.h
@@ -11,8 +11,11 @@
 #elif defined(LPC43XX)
 #	include <libopencm3/lpc43xx/nvic.h>
 
+#elif defined(LM3S)
+#	include <libopencm3/lm3s/nvic.h>
+
 #else
-#	warning"no chipset defined; user interrupts are disabled"
+#	warning"no interrupts defined for chipset; NVIC_IRQ_COUNT = 0"
 
 #define NVIC_IRQ_COUNT 0
 
diff --git a/lib/dispatch/vector_nvic.c b/lib/dispatch/vector_nvic.c
index fc5fdd2a..d5e4a606 100644
--- a/lib/dispatch/vector_nvic.c
+++ b/lib/dispatch/vector_nvic.c
@@ -11,8 +11,11 @@
 #elif defined(LPC43XX)
 #	include "../lpc43xx/vector_nvic.c"
 
+#elif defined(LM3S)
+#	include "../lm3s/vector_nvic.c"
+
 #else
-#	warning"no chipset defined; user interrupts are disabled"
+#	warning"no interrupts defined for chipset; not allocating space in the vector table"
 
 #define IRQ_HANDLERS