diff --git a/docs/Doxyfile b/docs/Doxyfile
index d13a29dd7..91e033402 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.1.5
+PROJECT_NUMBER         = 2.1.6
 
 # 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/platforms/STM32/can_lld.c b/os/hal/platforms/STM32/can_lld.c
index 0d9d173db..24a944c0f 100644
--- a/os/hal/platforms/STM32/can_lld.c
+++ b/os/hal/platforms/STM32/can_lld.c
@@ -145,7 +145,7 @@ CH_IRQ_HANDLER(CAN1_SCE_IRQHandler) {
     if ((esr & CAN_ESR_LEC) > 0)
       flags |= CAN_FRAMING_ERROR;
     chSysLockFromIsr();
-    canAddFlagsI(&CAND1, flags);
+    canAddFlagsI(&CAND1, flags | (canstatus_t)(flags < 16));
     chEvtBroadcastI(&CAND1.cd_error_event);
     chSysUnlockFromIsr();
   }
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 87c1c478e..f4dcfede0 100644
--- a/os/kernel/include/ch.h
+++ b/os/kernel/include/ch.h
@@ -39,7 +39,7 @@
 /**
  * @brief   Kernel version string.
  */
-#define CH_KERNEL_VERSION       "2.1.5unstable"
+#define CH_KERNEL_VERSION       "2.1.6unstable"
 
 /**
  * @brief   Kernel version major number.
@@ -54,7 +54,7 @@
 /**
  * @brief   Kernel version patch number.
  */
-#define CH_KERNEL_PATCH         5
+#define CH_KERNEL_PATCH         6
 
 /*
  * Common values.
diff --git a/readme.txt b/readme.txt
index cca1636d1..07f437938 100644
--- a/readme.txt
+++ b/readme.txt
@@ -64,6 +64,11 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.1.6 ***
+- NEW: Now the STM32 CAN driver puts the lower half word of the ESR
+  register in the upper half word of the can status word for easier
+  debug.
+
 *** 2.1.5 ***
 - FIX: Fixed references to non-existing SSP1 device in LPC13xx SPI device
   driver (bug 3127926).