diff --git a/include/libopencm3/stm32/f1/scb.h b/include/libopencm3/stm32/f1/scb.h
index b73ada39..5c965be8 100644
--- a/include/libopencm3/stm32/f1/scb.h
+++ b/include/libopencm3/stm32/f1/scb.h
@@ -127,12 +127,13 @@
 #define SCB_AIRCR_ENDIANESS			(1 << 15)
 /* Bits [14:11]: reserved - must be kept cleared */
 /* PRIGROUP[10:8]: Interrupt priority grouping field */
-#define SCB_AIRCR_PRIGROUP_LSB			8
-#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	0x3
-#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		0x4
-#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		0x5
-#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		0x6
-#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	0x7
+#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	(0x3 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		(0x4 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		(0x5 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		(0x6 << 8)
+#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_MASK			(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_SHIFT		8
 /* Bits [7:3]: reserved - must be kept cleared */
 /* SYSRESETREQ System reset request */
 #define SCB_AIRCR_SYSRESETREQ			(1 << 2)
diff --git a/include/libopencm3/stm32/f2/scb.h b/include/libopencm3/stm32/f2/scb.h
index b73ada39..5c965be8 100644
--- a/include/libopencm3/stm32/f2/scb.h
+++ b/include/libopencm3/stm32/f2/scb.h
@@ -127,12 +127,13 @@
 #define SCB_AIRCR_ENDIANESS			(1 << 15)
 /* Bits [14:11]: reserved - must be kept cleared */
 /* PRIGROUP[10:8]: Interrupt priority grouping field */
-#define SCB_AIRCR_PRIGROUP_LSB			8
-#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	0x3
-#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		0x4
-#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		0x5
-#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		0x6
-#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	0x7
+#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	(0x3 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		(0x4 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		(0x5 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		(0x6 << 8)
+#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_MASK			(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_SHIFT		8
 /* Bits [7:3]: reserved - must be kept cleared */
 /* SYSRESETREQ System reset request */
 #define SCB_AIRCR_SYSRESETREQ			(1 << 2)
diff --git a/include/libopencm3/stm32/f4/scb.h b/include/libopencm3/stm32/f4/scb.h
index b73ada39..5c965be8 100644
--- a/include/libopencm3/stm32/f4/scb.h
+++ b/include/libopencm3/stm32/f4/scb.h
@@ -127,12 +127,13 @@
 #define SCB_AIRCR_ENDIANESS			(1 << 15)
 /* Bits [14:11]: reserved - must be kept cleared */
 /* PRIGROUP[10:8]: Interrupt priority grouping field */
-#define SCB_AIRCR_PRIGROUP_LSB			8
-#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	0x3
-#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		0x4
-#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		0x5
-#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		0x6
-#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	0x7
+#define SCB_AIRCR_PRIGROUP_GROUP16_NOSUB	(0x3 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP8_SUB2		(0x4 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP4_SUB4		(0x5 << 8)
+#define SCB_AIRCR_PRIGROUP_GROUP2_SUB8		(0x6 << 8)
+#define SCB_AIRCR_PRIGROUP_NOGROUP_SUB16	(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_MASK			(0x7 << 8)
+#define SCB_AIRCR_PRIGROUP_SHIFT		8
 /* Bits [7:3]: reserved - must be kept cleared */
 /* SYSRESETREQ System reset request */
 #define SCB_AIRCR_SYSRESETREQ			(1 << 2)