diff --git a/docs/Doxyfile b/docs/Doxyfile
index 05a72bdee..bd879df67 100644
--- a/docs/Doxyfile
+++ b/docs/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = ChibiOS/RT
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 2.2.7
+PROJECT_NUMBER         = 2.2.8
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index e995ded45..72d0abbd6 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -46,7 +46,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.2.7"
+#define CH_KERNEL_VERSION       "2.2.8"
 
 /**
  * @brief   Kernel version major number.
@@ -61,7 +61,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         7
+#define CH_KERNEL_PATCH         8
 
 /*
  * Common values.
diff --git a/readme.txt b/readme.txt
index 2acd97619..8f98351f0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -68,6 +68,10 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.2.8 ***
+- FIX: Some ARMCMx makefiles refer the file rules.mk in the ARM7 port (bug
+  3411180).
+
 *** 2.2.7 ***
 - INFO: GCC test runs performed with YAGARTO 4.6.0.
 - NEW: Added debug plugin for Eclipse under ./tools/eclipse.
diff --git a/testhal/STM32/ADC/Makefile b/testhal/STM32/ADC/Makefile
index a5c76f1c8..e3f625987 100644
--- a/testhal/STM32/ADC/Makefile
+++ b/testhal/STM32/ADC/Makefile
@@ -201,4 +201,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/STM32/CAN/Makefile b/testhal/STM32/CAN/Makefile
index a5c76f1c8..e3f625987 100644
--- a/testhal/STM32/CAN/Makefile
+++ b/testhal/STM32/CAN/Makefile
@@ -201,4 +201,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/STM32/PWM/Makefile b/testhal/STM32/PWM/Makefile
index a5c76f1c8..e3f625987 100644
--- a/testhal/STM32/PWM/Makefile
+++ b/testhal/STM32/PWM/Makefile
@@ -201,4 +201,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/STM32/SPI/Makefile b/testhal/STM32/SPI/Makefile
index a5c76f1c8..e3f625987 100644
--- a/testhal/STM32/SPI/Makefile
+++ b/testhal/STM32/SPI/Makefile
@@ -201,4 +201,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk
diff --git a/testhal/STM32/UART/Makefile b/testhal/STM32/UART/Makefile
index a5c76f1c8..e3f625987 100644
--- a/testhal/STM32/UART/Makefile
+++ b/testhal/STM32/UART/Makefile
@@ -201,4 +201,4 @@ ifeq ($(USE_FWLIB),yes)
   USE_OPT += -DUSE_STDPERIPH_DRIVER
 endif
 
-include $(CHIBIOS)/os/ports/GCC/ARM/rules.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/rules.mk