diff --git a/docs/Doxyfile b/docs/Doxyfile
index b06b185bd..f48ccd630 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.5
+PROJECT_NUMBER         = 2.2.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/uart_lld.h b/os/hal/platforms/STM32/uart_lld.h
index af697faf4..899425a30 100644
--- a/os/hal/platforms/STM32/uart_lld.h
+++ b/os/hal/platforms/STM32/uart_lld.h
@@ -75,21 +75,21 @@
 /**
  * @brief   USART1 interrupt priority level setting.
  */
-#if !defined(STM32_UART_USART1_IRQ_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART1_IRQ_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART1_IRQ_PRIORITY      12
 #endif
 
 /**
  * @brief   USART2 interrupt priority level setting.
  */
-#if !defined(STM32_UART_USART2_IRQ_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART2_IRQ_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART2_IRQ_PRIORITY      12
 #endif
 
 /**
  * @brief   USART3 interrupt priority level setting.
  */
-#if !defined(STM32_UART_USART3_IRQ_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART3_IRQ_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART3_IRQ_PRIORITY      12
 #endif
 
@@ -99,7 +99,7 @@
  *          because of the channels ordering the RX channel has always priority
  *          over the TX channel.
  */
-#if !defined(STM32_UART_USART1_DMA_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART1_DMA_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #endif
 
@@ -109,7 +109,7 @@
  *          because of the channels ordering the RX channel has always priority
  *          over the TX channel.
  */
-#if !defined(STM32_UART_USART2_DMA_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART2_DMA_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #endif
 /**
@@ -118,7 +118,7 @@
  *          because of the channels ordering the RX channel has always priority
  *          over the TX channel.
  */
-#if !defined(STM32_UART_USART3_DMA_PRIO) || defined(__DOXYGEN__)
+#if !defined(STM32_UART_USART3_DMA_PRIORITY) || defined(__DOXYGEN__)
 #define STM32_UART_USART3_DMA_PRIORITY      0
 #endif
 
diff --git a/os/kernel/include/ch.h b/os/kernel/include/ch.h
index 18afecd78..1162da11b 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.5"
+#define CH_KERNEL_VERSION       "2.2.6"
 
 /**
  * @brief   Kernel version major number.
@@ -61,7 +61,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 c25838bcb..710c24e92 100644
--- a/readme.txt
+++ b/readme.txt
@@ -68,6 +68,9 @@
 *** Releases                                                              ***
 *****************************************************************************
 
+*** 2.2.6 ***
+- FIX: Fixed wrong macro check in STM32 UART driver (bug 3311999).
+
 *** 2.2.5 ***
 - FIX: Fixed STM32F107 demo build failure (bug 3294998).
 - NEW: Reorganization of the Cortex-Mx ports in order to reduced code and