diff --git a/docs/Doxyfile b/docs/Doxyfile
index c6d918e8c..3c84bdb22 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.3
+PROJECT_NUMBER         = 2.2.4
 
 # 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/hal/include/spi.h b/os/hal/include/spi.h
index 4317c3485..c9587e398 100644
--- a/os/hal/include/spi.h
+++ b/os/hal/include/spi.h
@@ -264,12 +264,14 @@ typedef enum {
  * @notapi
  */
 #define _spi_isr_code(spip) {                                               \
-  if ((spip)->spd_config->spc_endcb) {                                      \
-    (spip)->spd_state = SPI_COMPLETE;                                       \
-    (spip)->spd_config->spc_endcb(spip);                                    \
-    if ((spip)->spd_state == SPI_COMPLETE)                                  \
-      (spip)->spd_state = SPI_READY;                                        \
+  if ((spip)->config->end_cb) {                                             \
+    (spip)->state = SPI_COMPLETE;                                           \
+    (spip)->config->end_cb(spip);                                           \
+    if ((spip)->state == SPI_COMPLETE)                                      \
+      (spip)->state = SPI_READY;                                            \
   }                                                                         \
+  else                                                                      \
+    (spip)->state = SPI_READY;                                              \
   _spi_wakeup_isr(spip);                                                    \
 }
 
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 3c43776d2..c836a968d 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.3"
+#define CH_KERNEL_VERSION       "2.2.4"
 
 /**
  * @brief   Kernel version major number.
@@ -61,7 +61,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         3
+#define CH_KERNEL_PATCH         4
 
 /*
  * Common values.
diff --git a/readme.txt b/readme.txt
index 4d31accfd..8961f0993 100644
--- a/readme.txt
+++ b/readme.txt
@@ -68,6 +68,9 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.2.4 ***
+- FIX: Fixed missing state transition in SPI driver (bug 3288112).
+
 *** 2.2.3 ***
 - FIX: Fixed insufficient idle thread stack in Cortex-M0-GCC port
   (bug 3226671).