diff --git a/demos/ARMCM3-STM32F103/codeblocks/ch.cbp b/demos/ARMCM3-STM32F103/codeblocks/ch.cbp
index 8ca31ea80..eb8182c7d 100644
--- a/demos/ARMCM3-STM32F103/codeblocks/ch.cbp
+++ b/demos/ARMCM3-STM32F103/codeblocks/ch.cbp
@@ -68,7 +68,6 @@
 		<Unit filename="..\..\..\os\hal\include\adc.h" />
 		<Unit filename="..\..\..\os\hal\include\can.h" />
 		<Unit filename="..\..\..\os\hal\include\hal.h" />
-		<Unit filename="..\..\..\os\hal\include\i2c.h" />
 		<Unit filename="..\..\..\os\hal\include\mac.h" />
 		<Unit filename="..\..\..\os\hal\include\mii.h" />
 		<Unit filename="..\..\..\os\hal\include\mmc_spi.h" />
@@ -125,9 +124,6 @@
 		<Unit filename="..\..\..\os\hal\src\hal.c">
 			<Option compilerVar="CC" />
 		</Unit>
-		<Unit filename="..\..\..\os\hal\src\i2c.c">
-			<Option compilerVar="CC" />
-		</Unit>
 		<Unit filename="..\..\..\os\hal\src\mac.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -298,10 +294,10 @@
 		<Extensions>
 			<code_completion />
 			<debugger>
-				<remote_debugging target="Debug">
+				<remote_debugging target="Release">
 					<options conn_type="0" serial_baud="115200" ip_address="127.0.0.1" ip_port="3333" />
 				</remote_debugging>
-				<remote_debugging target="Release">
+				<remote_debugging target="Debug">
 					<options conn_type="0" serial_baud="115200" ip_address="127.0.0.1" ip_port="3333" />
 				</remote_debugging>
 			</debugger>
diff --git a/docs/reports/STM32F103-72-GCC.txt b/docs/reports/STM32F103-72-GCC.txt
index e9c768859..a07487787 100644
--- a/docs/reports/STM32F103-72-GCC.txt
+++ b/docs/reports/STM32F103-72-GCC.txt
@@ -5,7 +5,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 
 *** ChibiOS/RT test suite
 ***
-*** Kernel:       2.2.3
+*** Kernel:       2.2.4
 *** GCC Version:  4.5.2
 *** Architecture: ARMv7-M
 *** Core Variant: Cortex-M3
@@ -98,7 +98,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.1 (Benchmark, messages #1)
---- Score : 248574 msgs/S, 497148 ctxswc/S
+--- Score : 248573 msgs/S, 497146 ctxswc/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.2 (Benchmark, messages #2)
@@ -130,7 +130,7 @@ Settings: SYSCLK=72, ACR=0x12 (2 wait states)
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.9 (Benchmark, I/O Queues throughput)
---- Score : 479776 bytes/S
+--- Score : 581768 bytes/S
 --- Result: SUCCESS
 ----------------------------------------------------------------------------
 --- Test Case 11.10 (Benchmark, virtual timers set/reset)
diff --git a/readme.txt b/readme.txt
index 1ccc3ae6f..651fc07a0 100644
--- a/readme.txt
+++ b/readme.txt
@@ -69,7 +69,8 @@
 *****************************************************************************
 
 *** 2.2.4 ***
-- FIX: Race condition in output queues (bug 3303908).
+- FIX: Fixed CodeBlocks demo broken (bug 3304718).
+- FIX: Fixed race condition in output queues (bug 3303908).
 - FIX: Fixed CH_USE_HEAP and CH_USE_MALLOC_HEAP conflict (bug 3303841).
 - FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420).
 - FIX: Fixed invalid BRR() macro in AVR serial driver (bug 3299306).