diff --git a/Makefile-ARM b/Makefile-ARM
index 08a4d08..e4c4cdb 100644
--- a/Makefile-ARM
+++ b/Makefile-ARM
@@ -142,7 +142,7 @@ ifeq ($(MCU), lpc1114)
 else ifeq ($(findstring stm32, $(MCU)), stm32)
   CFLAGS += -mthumb -mcpu=cortex-m4
   CFLAGS += -mtune=cortex-m4
-  CFLAGS += -D__ARM_STM32F411__
+  CFLAGS += -D__ARM_STM32__
   CFLAGS += -mfpu=fpv4-sp-d16
   CFLAGS += -mfloat-abi=hard
   CFLAGS += -mlittle-endian
diff --git a/analog-stm32.c b/analog-stm32.c
index 897d64c..f2f3284 100644
--- a/analog-stm32.c
+++ b/analog-stm32.c
@@ -5,7 +5,7 @@
   each channel. We are using DMA instead.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 #include "cmsis-stm32f4xx.h"
 #include "arduino.h"
@@ -215,4 +215,4 @@ void start_adc() {
                ADC_CR2_SWSTART;
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */
diff --git a/analog.c b/analog.c
index ed237b0..0be849e 100644
--- a/analog.c
+++ b/analog.c
@@ -6,7 +6,7 @@
 #include "analog.h"
 #include "temp.h"
 
-#ifndef __ARM_STM32F411__
+#ifndef __ARM_STM32__
 /**
   OR-combined mask of all channels. Auto-magically generated from
   DEFINE_TEMP_SENSOR() entries in config_wrapper.h
diff --git a/analog.h b/analog.h
index 2cc3380..d0881c9 100644
--- a/analog.h
+++ b/analog.h
@@ -57,9 +57,9 @@
 #define NEEDS_START_ADC
 
 /* #endif __AVR__ */
-#elif __ARM_STM32F411__
+#elif __ARM_STM32__
   #define NEEDS_START_ADC
-#endif /* __ARM_STM32F411__ */
+#endif /* __ARM_STM32__ */
 
 void 			analog_init(void);
 
diff --git a/arduino.h b/arduino.h
index 62fd6f6..ed8ad14 100644
--- a/arduino.h
+++ b/arduino.h
@@ -73,7 +73,7 @@
     #include "arduino_lpc1114.h"
   #endif
 
-  #if defined (__ARM_STM32F411__)
+  #if defined (__ARM_STM32__)
     #include "arduino_stm32f411.h"
   #endif
 
diff --git a/cmsis-system_stm32f4xx.c b/cmsis-system_stm32f4xx.c
index 6d5d0c8..ad14fc1 100644
--- a/cmsis-system_stm32f4xx.c
+++ b/cmsis-system_stm32f4xx.c
@@ -73,13 +73,13 @@
 
   - Prefixed names of #include files with mbed- to match the names of the
     copies in the Teacup repo.
-  - Wrapped the whole file in #ifdef __ARM_STM32F411__ to not cause conflicts with
+  - Wrapped the whole file in #ifdef __ARM_STM32__ to not cause conflicts with
     AVR builds.
   - Rebuild SystemInit() and SetSysClock() to get rid of most mbed-files. Please take a look into history.
   - Rework SetSysClock completely
 */
 
-#ifdef __ARM_STM32F411__
+#ifdef __ARM_STM32__
 
 #include "cmsis-stm32f4xx.h"
 #include "arduino_stm32f411.h"
diff --git a/cpu-stm32.c b/cpu-stm32.c
index 1bc8a28..7dbf368 100644
--- a/cpu-stm32.c
+++ b/cpu-stm32.c
@@ -5,7 +5,7 @@
   To be included from cpu.c, for details see there.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
   
 #include "config_wrapper.h"
 
@@ -21,4 +21,4 @@ void cpu_init() {
                   RCC_AHB1ENR_GPIOHEN;
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */
diff --git a/cpu.h b/cpu.h
index 2c6e8d1..cffc613 100644
--- a/cpu.h
+++ b/cpu.h
@@ -10,7 +10,7 @@
 
   #include "cmsis-lpc11xx.h"  // For __ASM().
 
-#elif defined __ARM_STM32F411__
+#elif defined __ARM_STM32__
 
   #include "cmsis-stm32f4xx.h"  // For __ASM().
 
diff --git a/delay-stm32.c b/delay-stm32.c
index 5933cc4..6804723 100644
--- a/delay-stm32.c
+++ b/delay-stm32.c
@@ -3,7 +3,7 @@
   \brief Delay routines, ARM specific part.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 #include "cmsis-stm32f4xx.h"  // For __ASM() and ...
 
@@ -47,4 +47,4 @@ void delay_us(uint16_t delay) {
     }
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */
diff --git a/heater-stm32.c b/heater-stm32.c
index 731426f..f956835 100644
--- a/heater-stm32.c
+++ b/heater-stm32.c
@@ -3,7 +3,7 @@
   \brief Manage heaters, including PID and PWM, ARM specific part.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 #include "cmsis-stm32f4xx.h"
 #include "pinio.h"
@@ -262,4 +262,4 @@ void do_heater(heater_t index, uint8_t value) {
   }
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */
diff --git a/pinio.h b/pinio.h
index 6d41255..6211c39 100644
--- a/pinio.h
+++ b/pinio.h
@@ -114,7 +114,7 @@
       LPC_IOCON->IO ## _CMSIS = (IO ## _OUTPUT | IO_MODEMASK_INACTIVE); \
     } while (0)
 
-#elif defined __ARM_STM32F411__
+#elif defined __ARM_STM32__
   /// Read a pin.
   #define _READ(IO) 		(IO ## _PORT->IDR & MASK(IO ## _PIN))
   /// Write to a pin.
@@ -213,7 +213,7 @@
   #define _PULLUP_ON(IO)   _WRITE(IO, 1)
   #define _PULL_OFF(IO)    _WRITE(IO, 0)
 
-#endif /* __AVR__, __ARM_LPC1114__, __ARM_STM32F411__, SIMULATOR */
+#endif /* __AVR__, __ARM_LPC1114__, __ARM_STM32__, SIMULATOR */
 
 /**
   Why double up on these macros?
diff --git a/serial-stm32.c b/serial-stm32.c
index 6371208..895aa2b 100644
--- a/serial-stm32.c
+++ b/serial-stm32.c
@@ -10,7 +10,7 @@
   Code here is heavily inspired by serial_api.c of MBED
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 #include "arduino.h"
 #include "pinio.h"
@@ -214,4 +214,4 @@ void serial_writechar(uint8_t data) {
   uartx_writechar(UART_SERIAL, data);
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
\ No newline at end of file
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */
\ No newline at end of file
diff --git a/spi-stm32.c b/spi-stm32.c
index b716808..1992e92 100644
--- a/spi-stm32.c
+++ b/spi-stm32.c
@@ -3,7 +3,7 @@
   \brief SPI routines, STM32F411 specific part.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 /** Initialise SPI subsystem.
 
@@ -130,4 +130,4 @@ void spi_speed_max() {
   SPI2->CR1 |= SPI_CR1_BR_1 | SPI_CR1_BR_0;    // 1/16 -> SPI2 = 3.125MHz
 }
 
-#endif /* TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* TEACUP_C_INCLUDE && defined __ARM_STM32__ */
diff --git a/spi.h b/spi.h
index 0fc013c..6bbbc04 100644
--- a/spi.h
+++ b/spi.h
@@ -121,7 +121,7 @@ inline uint8_t spi_rw(uint8_t byte) {
   return SPDR;
 }
 
-#elif defined __ARM_STM32F411__
+#elif defined __ARM_STM32__
 
 void spi_speed_100_400(void);
 void spi_speed_max(void);
diff --git a/timer-stm32.c b/timer-stm32.c
index c5f19b0..675c39c 100644
--- a/timer-stm32.c
+++ b/timer-stm32.c
@@ -5,7 +5,7 @@
   To be included from timer.c.
 */
 
-#if defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__
+#if defined TEACUP_C_INCLUDE && defined __ARM_STM32__
 
 #include "cmsis-core_cm4.h"
 #include "clock.h"
@@ -226,4 +226,4 @@ void timer_stop() {
   SysTick->CTRL = 0;
 }
 
-#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32F411__ */
+#endif /* defined TEACUP_C_INCLUDE && defined __ARM_STM32__ */