diff --git a/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h b/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h
index 9ef64724a1..1858a9fa53 100644
--- a/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91FR40008_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91FR40008_GCC/Makefile b/Demo/ARM7_AT91FR40008_GCC/Makefile
index 7473385d46..00e35f98f3 100644
--- a/Demo/ARM7_AT91FR40008_GCC/Makefile
+++ b/Demo/ARM7_AT91FR40008_GCC/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c b/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c
index 730485bb02..10b1df0994 100644
--- a/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91FR40008_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91FR40008_GCC/main.c b/Demo/ARM7_AT91FR40008_GCC/main.c
index f6450688c0..83e59db3d4 100644
--- a/Demo/ARM7_AT91FR40008_GCC/main.c
+++ b/Demo/ARM7_AT91FR40008_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91FR40008_GCC/serial/serial.c b/Demo/ARM7_AT91FR40008_GCC/serial/serial.c
index a381302dff..26265584f2 100644
--- a/Demo/ARM7_AT91FR40008_GCC/serial/serial.c
+++ b/Demo/ARM7_AT91FR40008_GCC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c b/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c
index 99ac1673c1..d288952f65 100644
--- a/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c
+++ b/Demo/ARM7_AT91FR40008_GCC/serial/serialISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h b/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h
index 42f79ad2e6..ed2826d8a0 100644
--- a/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91SAM7S64_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c b/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c
index 1c8d3a122c..f415420c0c 100644
--- a/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c b/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
index 880f0fd216..4477d02e35 100644
--- a/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/USB/USBSample.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7S64_IAR/main.c b/Demo/ARM7_AT91SAM7S64_IAR/main.c
index 9babe0b787..2ba65f7449 100644
--- a/Demo/ARM7_AT91SAM7S64_IAR/main.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c b/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c
index 0444709720..799485db80 100644
--- a/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c
+++ b/Demo/ARM7_AT91SAM7S64_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 650f0247a4..18552db435 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
index 25e8251cf8..16c0305102 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
index 2b1d537a70..681344a1a1 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
index 5bb897d83d..5dbb8980fc 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
index 185b3a880e..7aa0ec4129 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USBSample.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c
index ee52c49269..5c5aa6a35a 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/USB/USB_ISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c
index ded3b23dbc..21005c84b8 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
index 6b1ab0a035..63f9bd034d 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/EMAC_ISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
index c91397ad15..204f3d4dbb 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h
index bb05a1b910..20fc10feba 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/SAM7_EMAC.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h
index ca27db5556..fed6332b19 100644
--- a/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h
+++ b/Demo/ARM7_AT91SAM7X256_Eclipse/RTOSDemo/webserver/uIP_Task.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h b/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h
index 3b3c3c2559..31d931233d 100644
--- a/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2106_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/Makefile b/Demo/ARM7_LPC2106_GCC/Makefile
index 93557ed243..83ebadc02e 100644
--- a/Demo/ARM7_LPC2106_GCC/Makefile
+++ b/Demo/ARM7_LPC2106_GCC/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c b/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c
index 9b41695817..36de8e346b 100644
--- a/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2106_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/main.c b/Demo/ARM7_LPC2106_GCC/main.c
index fbd0c454b0..3b57243207 100644
--- a/Demo/ARM7_LPC2106_GCC/main.c
+++ b/Demo/ARM7_LPC2106_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/serial/serial.c b/Demo/ARM7_LPC2106_GCC/serial/serial.c
index ddc2374194..bf2de2f226 100644
--- a/Demo/ARM7_LPC2106_GCC/serial/serial.c
+++ b/Demo/ARM7_LPC2106_GCC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2106_GCC/serial/serialISR.c b/Demo/ARM7_LPC2106_GCC/serial/serialISR.c
index 0d3d3d7ace..8a8bb33453 100644
--- a/Demo/ARM7_LPC2106_GCC/serial/serialISR.c
+++ b/Demo/ARM7_LPC2106_GCC/serial/serialISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h b/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h
index ff81ade2a3..6a0e09e287 100644
--- a/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c b/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c
index 41a8ba8f77..6e100793a1 100644
--- a/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2129_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_IAR/main.c b/Demo/ARM7_LPC2129_IAR/main.c
index a2219a9a57..38dadef392 100644
--- a/Demo/ARM7_LPC2129_IAR/main.c
+++ b/Demo/ARM7_LPC2129_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_IAR/serial/serial.c b/Demo/ARM7_LPC2129_IAR/serial/serial.c
index a61bf466e2..d389e05e5b 100644
--- a/Demo/ARM7_LPC2129_IAR/serial/serial.c
+++ b/Demo/ARM7_LPC2129_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
index 2472388c6a..728f89cf53 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c b/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c
index eaec762438..880739d1a5 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/main.c b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
index 265a9c718e..4080a96416 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/main.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
index bc9d105945..755b008843 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
index 6161bbf145..2fb395401e 100644
--- a/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
+++ b/Demo/ARM7_LPC2129_Keil_RVDS/serial/serialISR.s
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h b/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h
index 9a1472f46b..e85ced5b81 100644
--- a/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2138_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2138_Rowley/main.c b/Demo/ARM7_LPC2138_Rowley/main.c
index eab5ec76ea..63b26cac8b 100644
--- a/Demo/ARM7_LPC2138_Rowley/main.c
+++ b/Demo/ARM7_LPC2138_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2138_Rowley/mainISR.c b/Demo/ARM7_LPC2138_Rowley/mainISR.c
index ab9388b179..34cb1815e7 100644
--- a/Demo/ARM7_LPC2138_Rowley/mainISR.c
+++ b/Demo/ARM7_LPC2138_Rowley/mainISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 36c5838216..576ba92f6c 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
index 47ccf3ccc6..fd4ff23471 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c
index 5d91f4197d..b691677710 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
index ecdd5f53f3..247aad15ee 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
index 88be2867fc..9e6763052f 100644
--- a/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
+++ b/Demo/ARM7_LPC2368_Eclipse/RTOSDemo/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h b/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
index 22a170095d..cf62ef9999 100644
--- a/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
+++ b/Demo/ARM7_LPC2368_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c b/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
index 1b990122e4..2c68b2d038 100644
--- a/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
+++ b/Demo/ARM7_LPC2368_Rowley/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Rowley/main.c b/Demo/ARM7_LPC2368_Rowley/main.c
index 57e1859972..3a38734d98 100644
--- a/Demo/ARM7_LPC2368_Rowley/main.c
+++ b/Demo/ARM7_LPC2368_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c b/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
index 90fcdd6814..7eb8e2f02e 100644
--- a/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
+++ b/Demo/ARM7_LPC2368_Rowley/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h b/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h
index 8a8f2051f6..01ff8b2ef5 100644
--- a/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR71x_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c b/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c
index 16fb1b5e17..196f2c11a1 100644
--- a/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_STR71x_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR71x_IAR/main.c b/Demo/ARM7_STR71x_IAR/main.c
index e82d50c294..52d3123c71 100644
--- a/Demo/ARM7_STR71x_IAR/main.c
+++ b/Demo/ARM7_STR71x_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR71x_IAR/serial/serial.c b/Demo/ARM7_STR71x_IAR/serial/serial.c
index edfc301ce8..669b9f952e 100644
--- a/Demo/ARM7_STR71x_IAR/serial/serial.c
+++ b/Demo/ARM7_STR71x_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h b/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h
index 8fde413492..f3ada2bf11 100644
--- a/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR75x_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c b/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c
index cbef4d96dc..0a74a47d64 100644
--- a/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c
+++ b/Demo/ARM7_STR75x_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_GCC/main.c b/Demo/ARM7_STR75x_GCC/main.c
index 2028aaf254..1e20724e56 100644
--- a/Demo/ARM7_STR75x_GCC/main.c
+++ b/Demo/ARM7_STR75x_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_GCC/serial/serial.c b/Demo/ARM7_STR75x_GCC/serial/serial.c
index f5a390fd93..ee9a6772d8 100644
--- a/Demo/ARM7_STR75x_GCC/serial/serial.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_GCC/serial/serialISR.c b/Demo/ARM7_STR75x_GCC/serial/serialISR.c
index 7db9d7e39f..544cbfc205 100644
--- a/Demo/ARM7_STR75x_GCC/serial/serialISR.c
+++ b/Demo/ARM7_STR75x_GCC/serial/serialISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h b/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h
index e38a0a573b..8ad5106236 100644
--- a/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM7_STR75x_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c b/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c
index cbef4d96dc..0a74a47d64 100644
--- a/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c
+++ b/Demo/ARM7_STR75x_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_IAR/main.c b/Demo/ARM7_STR75x_IAR/main.c
index cad93294af..de2226fe36 100644
--- a/Demo/ARM7_STR75x_IAR/main.c
+++ b/Demo/ARM7_STR75x_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM7_STR75x_IAR/serial/serial.c b/Demo/ARM7_STR75x_IAR/serial/serial.c
index d27046a78e..461a5947b7 100644
--- a/Demo/ARM7_STR75x_IAR/serial/serial.c
+++ b/Demo/ARM7_STR75x_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
index 3a38cd62c8..68fb8e415a 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM9_AT91SAM9XE_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
index 29133d59b2..6b09467524 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/main.c b/Demo/ARM9_AT91SAM9XE_IAR/main.c
index a653396cd0..620d2716be 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/main.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_AT91SAM9XE_IAR/serial/serial.c b/Demo/ARM9_AT91SAM9XE_IAR/serial/serial.c
index fd18435809..8ee4618616 100644
--- a/Demo/ARM9_AT91SAM9XE_IAR/serial/serial.c
+++ b/Demo/ARM9_AT91SAM9XE_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h b/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h
index ad3311da25..f7068e98de 100644
--- a/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h
+++ b/Demo/ARM9_STR91X_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/ParTest/ParTest.c b/Demo/ARM9_STR91X_IAR/ParTest/ParTest.c
index 723b0f4e8f..950973d04e 100644
--- a/Demo/ARM9_STR91X_IAR/ParTest/ParTest.c
+++ b/Demo/ARM9_STR91X_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/lwip/include/lwIPWebServer/BasicWEB.h b/Demo/ARM9_STR91X_IAR/lwip/include/lwIPWebServer/BasicWEB.h
index d8367088b8..fdbfaa5c4a 100644
--- a/Demo/ARM9_STR91X_IAR/lwip/include/lwIPWebServer/BasicWEB.h
+++ b/Demo/ARM9_STR91X_IAR/lwip/include/lwIPWebServer/BasicWEB.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/lwip/lwipWebServer/BasicWEB.c b/Demo/ARM9_STR91X_IAR/lwip/lwipWebServer/BasicWEB.c
index 33fc3545ec..bef506f21e 100644
--- a/Demo/ARM9_STR91X_IAR/lwip/lwipWebServer/BasicWEB.c
+++ b/Demo/ARM9_STR91X_IAR/lwip/lwipWebServer/BasicWEB.c
@@ -1,6 +1,6 @@
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/main.c b/Demo/ARM9_STR91X_IAR/main.c
index fdb5b5c55e..a9d06a1071 100644
--- a/Demo/ARM9_STR91X_IAR/main.c
+++ b/Demo/ARM9_STR91X_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/serial/serial.c b/Demo/ARM9_STR91X_IAR/serial/serial.c
index d453aa5e1e..367031e7a0 100644
--- a/Demo/ARM9_STR91X_IAR/serial/serial.c
+++ b/Demo/ARM9_STR91X_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ARM9_STR91X_IAR/webserver/uIP_Task.c b/Demo/ARM9_STR91X_IAR/webserver/uIP_Task.c
index 407e8068b0..69450024e7 100644
--- a/Demo/ARM9_STR91X_IAR/webserver/uIP_Task.c
+++ b/Demo/ARM9_STR91X_IAR/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR32_UC3/main.c b/Demo/AVR32_UC3/main.c
index 3eef142de2..d86dec645e 100644
--- a/Demo/AVR32_UC3/main.c
+++ b/Demo/AVR32_UC3/main.c
@@ -30,7 +30,7 @@
  *****************************************************************************/
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h b/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h
index 38e1a9bcce..ba4f5caa10 100644
--- a/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h
+++ b/Demo/AVR_ATMega323_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c b/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c
index 8379425053..97d212f720 100644
--- a/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c
+++ b/Demo/AVR_ATMega323_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/main.c b/Demo/AVR_ATMega323_IAR/main.c
index 3edd1fe28b..733171afe0 100644
--- a/Demo/AVR_ATMega323_IAR/main.c
+++ b/Demo/AVR_ATMega323_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/regtest.c b/Demo/AVR_ATMega323_IAR/regtest.c
index 4875ea2b81..f090e82a05 100644
--- a/Demo/AVR_ATMega323_IAR/regtest.c
+++ b/Demo/AVR_ATMega323_IAR/regtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/regtest.h b/Demo/AVR_ATMega323_IAR/regtest.h
index 12268d4f19..9c6eac5b62 100644
--- a/Demo/AVR_ATMega323_IAR/regtest.h
+++ b/Demo/AVR_ATMega323_IAR/regtest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_IAR/serial/serial.c b/Demo/AVR_ATMega323_IAR/serial/serial.c
index 4b3b75553e..f134d2b497 100644
--- a/Demo/AVR_ATMega323_IAR/serial/serial.c
+++ b/Demo/AVR_ATMega323_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h b/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h
index c842fff6a8..19896c6aa0 100644
--- a/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h
+++ b/Demo/AVR_ATMega323_WinAVR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c b/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c
index 7c5cdad164..cda1e8e3a4 100644
--- a/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c
+++ b/Demo/AVR_ATMega323_WinAVR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/main.c b/Demo/AVR_ATMega323_WinAVR/main.c
index a6d1dcfa16..9faf9acb25 100644
--- a/Demo/AVR_ATMega323_WinAVR/main.c
+++ b/Demo/AVR_ATMega323_WinAVR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/regtest.c b/Demo/AVR_ATMega323_WinAVR/regtest.c
index c3e48ed2df..b387a5230a 100644
--- a/Demo/AVR_ATMega323_WinAVR/regtest.c
+++ b/Demo/AVR_ATMega323_WinAVR/regtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/regtest.h b/Demo/AVR_ATMega323_WinAVR/regtest.h
index 12268d4f19..9c6eac5b62 100644
--- a/Demo/AVR_ATMega323_WinAVR/regtest.h
+++ b/Demo/AVR_ATMega323_WinAVR/regtest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/AVR_ATMega323_WinAVR/serial/serial.c b/Demo/AVR_ATMega323_WinAVR/serial/serial.c
index 57cf83bddb..1602b2bf19 100644
--- a/Demo/AVR_ATMega323_WinAVR/serial/serial.c
+++ b/Demo/AVR_ATMega323_WinAVR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h b/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
index 746ae5ad30..522488d74d 100644
--- a/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/ParTest/ParTest.c b/Demo/CORTEX_AT91SAM3U256_IAR/ParTest/ParTest.c
index 7e8b99aa96..4c392b7a02 100644
--- a/Demo/CORTEX_AT91SAM3U256_IAR/ParTest/ParTest.c
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/lcd_message.h b/Demo/CORTEX_AT91SAM3U256_IAR/lcd_message.h
index a79ca43a98..28b9d99223 100644
--- a/Demo/CORTEX_AT91SAM3U256_IAR/lcd_message.h
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/lcd_message.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/main.c b/Demo/CORTEX_AT91SAM3U256_IAR/main.c
index 71944e2151..3cb63d58ab 100644
--- a/Demo/CORTEX_AT91SAM3U256_IAR/main.c
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c b/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
index d6a4958099..cbc6b31c79 100644
--- a/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/FreeRTOSConfig.h b/Demo/CORTEX_EFMG890F128_IAR/FreeRTOSConfig.h
index d4d0a7f435..97f58193e1 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_EFMG890F128_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/ParTest.c b/Demo/CORTEX_EFMG890F128_IAR/ParTest.c
index 0915b022d4..2815c0352f 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/ParTest.c
+++ b/Demo/CORTEX_EFMG890F128_IAR/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/lcdtest.c b/Demo/CORTEX_EFMG890F128_IAR/lcdtest.c
index 0e8754473e..033e339e7e 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/lcdtest.c
+++ b/Demo/CORTEX_EFMG890F128_IAR/lcdtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/ledtest.c b/Demo/CORTEX_EFMG890F128_IAR/ledtest.c
index b29f2b0638..fba5c5765e 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/ledtest.c
+++ b/Demo/CORTEX_EFMG890F128_IAR/ledtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/ledtest.h b/Demo/CORTEX_EFMG890F128_IAR/ledtest.h
index 122816f680..8ea798b77c 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/ledtest.h
+++ b/Demo/CORTEX_EFMG890F128_IAR/ledtest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_EFMG890F128_IAR/main.c b/Demo/CORTEX_EFMG890F128_IAR/main.c
index b23c7e1135..7d3d69e789 100644
--- a/Demo/CORTEX_EFMG890F128_IAR/main.c
+++ b/Demo/CORTEX_EFMG890F128_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h
index e6c497efd0..933d96dae4 100644
--- a/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_GCC/Demo1/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
index 1875919585..a86175f90d 100644
--- a/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_GCC/Demo1/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h
index af527e3a0c..1801a6dcdc 100644
--- a/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_GCC/Demo2/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/Demo2/main.c b/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
index 4314c5718c..af1df06bec 100644
--- a/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
+++ b/Demo/CORTEX_LM3S102_GCC/Demo2/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h
index e776a00502..22f3e3f352 100644
--- a/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c b/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c
index 9625f11787..786a7ae486 100644
--- a/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3S102_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_GCC/main.c b/Demo/CORTEX_LM3S102_GCC/main.c
index 1875919585..a86175f90d 100644
--- a/Demo/CORTEX_LM3S102_GCC/main.c
+++ b/Demo/CORTEX_LM3S102_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h
index e6c497efd0..933d96dae4 100644
--- a/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
index 4234b9076b..43e0a736b0 100644
--- a/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo1/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h
index af527e3a0c..1801a6dcdc 100644
--- a/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo2/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c b/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c
index 9a90f6ed58..ba3ce4cc52 100644
--- a/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/Demo2/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h
index e284f63fc7..0535ce100a 100644
--- a/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_KEIL/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c b/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c
index 9625f11787..786a7ae486 100644
--- a/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3S102_KEIL/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_KEIL/main.c b/Demo/CORTEX_LM3S102_KEIL/main.c
index 4234b9076b..43e0a736b0 100644
--- a/Demo/CORTEX_LM3S102_KEIL/main.c
+++ b/Demo/CORTEX_LM3S102_KEIL/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h
index e776a00502..22f3e3f352 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c
index 9625f11787..786a7ae486 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
index 08e376e904..def3aaac5a 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo1/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h
index 03b1877ea2..4f3d04febf 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c
index 9625f11787..786a7ae486 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c
index 647b239555..d18440f21b 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo2/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h b/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h
index e4c99b9804..a5f1e8e2df 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c b/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c
index 71b85ee541..02f9620ff2 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c b/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
index d3ad401c15..f6d6a2eb6a 100644
--- a/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
+++ b/Demo/CORTEX_LM3S102_Rowley/Demo3/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h
index f112af8733..32825c64ba 100644
--- a/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S316_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c b/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c
index 9625f11787..786a7ae486 100644
--- a/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3S316_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S316_IAR/commstest.c b/Demo/CORTEX_LM3S316_IAR/commstest.c
index 51767e72fe..270af381b3 100644
--- a/Demo/CORTEX_LM3S316_IAR/commstest.c
+++ b/Demo/CORTEX_LM3S316_IAR/commstest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S316_IAR/commstest.h b/Demo/CORTEX_LM3S316_IAR/commstest.h
index 35199f481b..20da559027 100644
--- a/Demo/CORTEX_LM3S316_IAR/commstest.h
+++ b/Demo/CORTEX_LM3S316_IAR/commstest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S316_IAR/main.c b/Demo/CORTEX_LM3S316_IAR/main.c
index 41a3192c7d..2a2e5dfee7 100644
--- a/Demo/CORTEX_LM3S316_IAR/main.c
+++ b/Demo/CORTEX_LM3S316_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h
index e3a49645fb..4494ccbf6f 100644
--- a/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S811_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_GCC/main.c b/Demo/CORTEX_LM3S811_GCC/main.c
index bf24114b64..2de1faad3c 100644
--- a/Demo/CORTEX_LM3S811_GCC/main.c
+++ b/Demo/CORTEX_LM3S811_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h
index b5b004f45b..cb963ecc70 100644
--- a/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S811_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_IAR/main.c b/Demo/CORTEX_LM3S811_IAR/main.c
index a1d2bd35ae..9da7e47ee3 100644
--- a/Demo/CORTEX_LM3S811_IAR/main.c
+++ b/Demo/CORTEX_LM3S811_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
index f35764d034..f773c81769 100644
--- a/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3S811_KEIL/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c b/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c
index 6b52276be3..6991164a4b 100644
--- a/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c
+++ b/Demo/CORTEX_LM3S811_KEIL/heap/heap_1.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3S811_KEIL/main.c b/Demo/CORTEX_LM3S811_KEIL/main.c
index d1aa5a174e..4cb9bef52a 100644
--- a/Demo/CORTEX_LM3S811_KEIL/main.c
+++ b/Demo/CORTEX_LM3S811_KEIL/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 2e811e9565..0c2efac478 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
index c642d5bc74..89e2fac70d 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.h b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.h
index f88b1d3e00..876a928a9f 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.h
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/IntQueueTimer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/Makefile b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/Makefile
index 3ef726130d..6a3b7e3ac3 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/Makefile
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/ParTest/ParTest.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/ParTest/ParTest.c
index e6aa7551e8..c8ace6b21a 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
index f86ea6c09e..0834620858 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c
index 592dd055f4..98565e2816 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c
index e8c6844c70..f004075ba1 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c
index e77ae4b7cf..385e31064a 100644
--- a/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LM3Sxxxx_Eclipse/RTOSDemo/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
index 8812058c12..4626c21d64 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.c
index c642d5bc74..89e2fac70d 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.h b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.h
index f88b1d3e00..876a928a9f 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.h
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/IntQueueTimer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/ParTest/ParTest.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/ParTest/ParTest.c
index e6aa7551e8..c8ace6b21a 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
index 63332b98fc..4b715126b9 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c
index c8a8526b42..dd590814a6 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c
index e9891279e6..3aa2eadf70 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c
index 097526ee61..f8ace82459 100644
--- a/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LM3Sxxxx_IAR_Keil/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h b/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h
index 45860f0327..b8d4051c38 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c
index c642d5bc74..89e2fac70d 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h
index f88b1d3e00..876a928a9f 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/IntQueueTimer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c b/Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c
index e6aa7551e8..c8ace6b21a 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/main.c b/Demo/CORTEX_LM3Sxxxx_Rowley/main.c
index 8e62eac47a..a71d6ffab8 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/main.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c b/Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c
index 2210aa2996..7c940aeb7c 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c
index 78323adab1..80e428f14a 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c
index d143eab4a7..199cac9b26 100644
--- a/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LM3Sxxxx_Rowley/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
index 1e7a128a9a..85909debdf 100644
--- a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/ParTest.c b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/ParTest.c
index b79cfce37a..62fc4350e6 100644
--- a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/ParTest.c
+++ b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c
index e3c0acefa7..e62287ba16 100644
--- a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c
+++ b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/emac.c b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/emac.c
index c9b8b65974..0c1179648a 100644
--- a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/emac.c
+++ b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/uIP_Task.c b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/uIP_Task.c
index 04e69af043..d498ce165d 100644
--- a/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LPC1768_GCC_RedSuite/src/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h b/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h
index 0c6820810c..cf0444b780 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/LED.h b/Demo/CORTEX_LPC1768_GCC_Rowley/LED.h
index 3904b336a5..1ae4d73b91 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/LED.h
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/LED.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c b/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
index 3a13f74d99..ae5efb2bab 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/main.c b/Demo/CORTEX_LPC1768_GCC_Rowley/main.c
index 8ad63465dc..59c4ed9dd4 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/main.c
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/emac.c b/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/emac.c
index 71a56a5f82..50461bf03a 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/emac.c
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/uIP_Task.c b/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/uIP_Task.c
index a624f01992..366f13105c 100644
--- a/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LPC1768_GCC_Rowley/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h b/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h
index ff985ca037..f2f0e42ac1 100644
--- a/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_LPC1768_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/LED.h b/Demo/CORTEX_LPC1768_IAR/LED.h
index 3904b336a5..1ae4d73b91 100644
--- a/Demo/CORTEX_LPC1768_IAR/LED.h
+++ b/Demo/CORTEX_LPC1768_IAR/LED.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/ParTest.c b/Demo/CORTEX_LPC1768_IAR/ParTest.c
index 4de4365d73..1eea2836fd 100644
--- a/Demo/CORTEX_LPC1768_IAR/ParTest.c
+++ b/Demo/CORTEX_LPC1768_IAR/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/main.c b/Demo/CORTEX_LPC1768_IAR/main.c
index 85c53d433b..cb50dfc3f8 100644
--- a/Demo/CORTEX_LPC1768_IAR/main.c
+++ b/Demo/CORTEX_LPC1768_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/webserver/emac.c b/Demo/CORTEX_LPC1768_IAR/webserver/emac.c
index 3de0dc5b3b..734bf31080 100644
--- a/Demo/CORTEX_LPC1768_IAR/webserver/emac.c
+++ b/Demo/CORTEX_LPC1768_IAR/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_LPC1768_IAR/webserver/uIP_Task.c b/Demo/CORTEX_LPC1768_IAR/webserver/uIP_Task.c
index a624f01992..366f13105c 100644
--- a/Demo/CORTEX_LPC1768_IAR/webserver/uIP_Task.c
+++ b/Demo/CORTEX_LPC1768_IAR/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h b/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h
index 5cfaf1023a..fc076e5e98 100644
--- a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h
+++ b/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c b/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c
index 06a5868943..1e8f5872f0 100644
--- a/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c
+++ b/Demo/CORTEX_MPU_LM3Sxxxx_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h b/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
index 35ab27d735..16f67b5d1d 100644
--- a/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
+++ b/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/main.c b/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/main.c
index 92ef99044f..5648db0398 100644
--- a/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/main.c
+++ b/Demo/CORTEX_MPU_LPC1768_GCC_RedSuite/src/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_IAR/FreeRTOSConfig.h b/Demo/CORTEX_STM32F103_IAR/FreeRTOSConfig.h
index a34af5bf19..93580f658c 100644
--- a/Demo/CORTEX_STM32F103_IAR/FreeRTOSConfig.h
+++ b/Demo/CORTEX_STM32F103_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c b/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c
index 7c830b6431..6adb16e79d 100644
--- a/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c
+++ b/Demo/CORTEX_STM32F103_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_IAR/main.c b/Demo/CORTEX_STM32F103_IAR/main.c
index e52c565d33..8acfb45356 100644
--- a/Demo/CORTEX_STM32F103_IAR/main.c
+++ b/Demo/CORTEX_STM32F103_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_IAR/serial/serial.c b/Demo/CORTEX_STM32F103_IAR/serial/serial.c
index 18ccafdfd4..953f7ecda8 100644
--- a/Demo/CORTEX_STM32F103_IAR/serial/serial.c
+++ b/Demo/CORTEX_STM32F103_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_IAR/timertest.c b/Demo/CORTEX_STM32F103_IAR/timertest.c
index 15d248863e..372898838e 100644
--- a/Demo/CORTEX_STM32F103_IAR/timertest.c
+++ b/Demo/CORTEX_STM32F103_IAR/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Keil/FreeRTOSConfig.h b/Demo/CORTEX_STM32F103_Keil/FreeRTOSConfig.h
index a34af5bf19..93580f658c 100644
--- a/Demo/CORTEX_STM32F103_Keil/FreeRTOSConfig.h
+++ b/Demo/CORTEX_STM32F103_Keil/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c b/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c
index 7c830b6431..6adb16e79d 100644
--- a/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c
+++ b/Demo/CORTEX_STM32F103_Keil/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Keil/main.c b/Demo/CORTEX_STM32F103_Keil/main.c
index e52c565d33..8acfb45356 100644
--- a/Demo/CORTEX_STM32F103_Keil/main.c
+++ b/Demo/CORTEX_STM32F103_Keil/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Keil/serial/serial.c b/Demo/CORTEX_STM32F103_Keil/serial/serial.c
index 18ccafdfd4..953f7ecda8 100644
--- a/Demo/CORTEX_STM32F103_Keil/serial/serial.c
+++ b/Demo/CORTEX_STM32F103_Keil/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Keil/timertest.c b/Demo/CORTEX_STM32F103_Keil/timertest.c
index 15d248863e..372898838e 100644
--- a/Demo/CORTEX_STM32F103_Keil/timertest.c
+++ b/Demo/CORTEX_STM32F103_Keil/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Primer_GCC/FreeRTOSConfig.h b/Demo/CORTEX_STM32F103_Primer_GCC/FreeRTOSConfig.h
index 7571f21671..cfecb37a08 100644
--- a/Demo/CORTEX_STM32F103_Primer_GCC/FreeRTOSConfig.h
+++ b/Demo/CORTEX_STM32F103_Primer_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c b/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c
index 03c58aeeaa..e46f368f97 100644
--- a/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c
+++ b/Demo/CORTEX_STM32F103_Primer_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Primer_GCC/bitmap.h b/Demo/CORTEX_STM32F103_Primer_GCC/bitmap.h
index 9c908361be..fd31425670 100644
--- a/Demo/CORTEX_STM32F103_Primer_GCC/bitmap.h
+++ b/Demo/CORTEX_STM32F103_Primer_GCC/bitmap.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Primer_GCC/main.c b/Demo/CORTEX_STM32F103_Primer_GCC/main.c
index 607132dee9..9cda8cb2d9 100644
--- a/Demo/CORTEX_STM32F103_Primer_GCC/main.c
+++ b/Demo/CORTEX_STM32F103_Primer_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c b/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
index 15d248863e..372898838e 100644
--- a/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
+++ b/Demo/CORTEX_STM32F103_Primer_GCC/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h b/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h
index 3bdd523cf1..d43ad0abda 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/ParTest/ParTest.c b/Demo/CORTEX_STM32F107_GCC_Rowley/ParTest/ParTest.c
index b43f50d228..b85cf35e31 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/ParTest/ParTest.c
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/main.c b/Demo/CORTEX_STM32F107_GCC_Rowley/main.c
index 3c4ce1e1b1..5f8fe496bf 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/main.c
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/timertest.c b/Demo/CORTEX_STM32F107_GCC_Rowley/timertest.c
index 57e0e440db..c06fd3ba5a 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/timertest.c
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.c b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.c
index 0c4d313e18..b718006be7 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.c
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.h b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.h
index cb7d729116..b7c82b7df9 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.h
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/emac.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/uIP_Task.c b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/uIP_Task.c
index 7c18a260e2..009accf118 100644
--- a/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/uIP_Task.c
+++ b/Demo/CORTEX_STM32F107_GCC_Rowley/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h
index 574219a8be..c2999b5cd3 100644
--- a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/ParTest/ParTest.c b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/ParTest/ParTest.c
index be27945f8c..774eb777d6 100644
--- a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/ParTest/ParTest.c
+++ b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/httpd/uIP_Task.c b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/httpd/uIP_Task.c
index 02f971dc00..b4af2575b0 100644
--- a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/httpd/uIP_Task.c
+++ b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/httpd/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/main.c b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/main.c
index 4cc5ad99ed..7304590680 100644
--- a/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/main.c
+++ b/Demo/ColdFire_MCF51CN128_CodeWarrior/Sources/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
index 02b20453ae..2fec979392 100644
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
index 2db3527ce6..0cfa360da9 100644
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/FreeRTOS_Tick_Setup.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/ParTest/ParTest.c b/Demo/ColdFire_MCF52221_CodeWarrior/sources/ParTest/ParTest.c
index d14e8899d3..68b1be605e 100644
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/ParTest/ParTest.c
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c b/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
index 7fe2d7a288..6c52bd464f 100644
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c b/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c
index 9d3a4d0bd2..30dd216d68 100644
--- a/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c
+++ b/Demo/ColdFire_MCF52221_CodeWarrior/sources/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 9cd1d6995f..82ac270bf2 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index ac23f085b9..0a2cd2ac7c 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c
index 237030c71e..19c698dbbd 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c
index 345ad88747..72f8ff858e 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c
index 1a0697084f..ec44067814 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/FEC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uIP_Task.c b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uIP_Task.c
index 4f1c568809..fcb0261fd7 100644
--- a/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uIP_Task.c
+++ b/Demo/ColdFire_MCF52233_Eclipse/RTOSDemo/webserver/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h b/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h
index a9b1c93a4c..4e0d4ee59c 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
index 0d0b5997c5..7b467033b8 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/FreeRTOS_Tick_Setup.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c b/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c
index 89ef3447df..4726c17203 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.h b/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.h
index c586d9995a..e586e95733 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.h
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/HTTPDemo.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/ParTest/ParTest.c b/Demo/ColdFire_MCF52259_CodeWarrior/ParTest/ParTest.c
index d14e8899d3..68b1be605e 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/ParTest/ParTest.c
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF52259_CodeWarrior/main.c b/Demo/ColdFire_MCF52259_CodeWarrior/main.c
index 6aef7135c8..ed180ce544 100644
--- a/Demo/ColdFire_MCF52259_CodeWarrior/main.c
+++ b/Demo/ColdFire_MCF52259_CodeWarrior/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
index 43169ecca4..177e90347d 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
index ac23f085b9..0a2cd2ac7c 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/FreeRTOS_Tick_Setup.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
index ceebbd8fca..1ae4fe99b1 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.h b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.h
index f88b1d3e00..876a928a9f 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.h
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/IntQueueTimer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c
index 4e26f28701..1a7b17b565 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
index fa3c1ae659..1dabb6db56 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
index bfb4146d1b..55d9ffa1de 100644
--- a/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
+++ b/Demo/ColdFire_MCF5282_Eclipse/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/BlockQ.c b/Demo/Common/Full/BlockQ.c
index 6497446b34..9971ec4157 100644
--- a/Demo/Common/Full/BlockQ.c
+++ b/Demo/Common/Full/BlockQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/PollQ.c b/Demo/Common/Full/PollQ.c
index 686cf4bfaa..47007d46c9 100644
--- a/Demo/Common/Full/PollQ.c
+++ b/Demo/Common/Full/PollQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/comtest.c b/Demo/Common/Full/comtest.c
index e264621f24..8eb0aae8b1 100644
--- a/Demo/Common/Full/comtest.c
+++ b/Demo/Common/Full/comtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/death.c b/Demo/Common/Full/death.c
index b4a34dfc43..0d5f5d1a82 100644
--- a/Demo/Common/Full/death.c
+++ b/Demo/Common/Full/death.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/dynamic.c b/Demo/Common/Full/dynamic.c
index 492cb9833a..7d2f117b42 100644
--- a/Demo/Common/Full/dynamic.c
+++ b/Demo/Common/Full/dynamic.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/events.c b/Demo/Common/Full/events.c
index 6ca008557e..932a107268 100644
--- a/Demo/Common/Full/events.c
+++ b/Demo/Common/Full/events.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/flash.c b/Demo/Common/Full/flash.c
index ffccdc1c33..1ce249857f 100644
--- a/Demo/Common/Full/flash.c
+++ b/Demo/Common/Full/flash.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/flop.c b/Demo/Common/Full/flop.c
index d25c0faf38..0ae44ee0b7 100644
--- a/Demo/Common/Full/flop.c
+++ b/Demo/Common/Full/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/integer.c b/Demo/Common/Full/integer.c
index 57e412b480..06f1d0f2ca 100644
--- a/Demo/Common/Full/integer.c
+++ b/Demo/Common/Full/integer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/print.c b/Demo/Common/Full/print.c
index 34fb1bcd76..920a3481f1 100644
--- a/Demo/Common/Full/print.c
+++ b/Demo/Common/Full/print.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Full/semtest.c b/Demo/Common/Full/semtest.c
index 9ed54040fa..7b43c8b138 100644
--- a/Demo/Common/Full/semtest.c
+++ b/Demo/Common/Full/semtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/AltBlckQ.c b/Demo/Common/Minimal/AltBlckQ.c
index 18f0e237c5..36611c0663 100644
--- a/Demo/Common/Minimal/AltBlckQ.c
+++ b/Demo/Common/Minimal/AltBlckQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/AltBlock.c b/Demo/Common/Minimal/AltBlock.c
index 6b4a8c4d5e..4aca70c435 100644
--- a/Demo/Common/Minimal/AltBlock.c
+++ b/Demo/Common/Minimal/AltBlock.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/AltPollQ.c b/Demo/Common/Minimal/AltPollQ.c
index 02d0bad077..264d12fc20 100644
--- a/Demo/Common/Minimal/AltPollQ.c
+++ b/Demo/Common/Minimal/AltPollQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/AltQTest.c b/Demo/Common/Minimal/AltQTest.c
index 3fc486f19a..550c92dbb6 100644
--- a/Demo/Common/Minimal/AltQTest.c
+++ b/Demo/Common/Minimal/AltQTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/BlockQ.c b/Demo/Common/Minimal/BlockQ.c
index 51307ff4fd..2ca16c6aa5 100644
--- a/Demo/Common/Minimal/BlockQ.c
+++ b/Demo/Common/Minimal/BlockQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/GenQTest.c b/Demo/Common/Minimal/GenQTest.c
index 1f2a26483d..b107466f52 100644
--- a/Demo/Common/Minimal/GenQTest.c
+++ b/Demo/Common/Minimal/GenQTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/IntQueue.c b/Demo/Common/Minimal/IntQueue.c
index 5868337fc1..77947ce6ac 100644
--- a/Demo/Common/Minimal/IntQueue.c
+++ b/Demo/Common/Minimal/IntQueue.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/PollQ.c b/Demo/Common/Minimal/PollQ.c
index d5edaa6ca2..2b0e745c5e 100644
--- a/Demo/Common/Minimal/PollQ.c
+++ b/Demo/Common/Minimal/PollQ.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/QPeek.c b/Demo/Common/Minimal/QPeek.c
index bdf91981d0..4db9a574ef 100644
--- a/Demo/Common/Minimal/QPeek.c
+++ b/Demo/Common/Minimal/QPeek.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/blocktim.c b/Demo/Common/Minimal/blocktim.c
index 6dbd05ad32..2c332b17b4 100644
--- a/Demo/Common/Minimal/blocktim.c
+++ b/Demo/Common/Minimal/blocktim.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/comtest.c b/Demo/Common/Minimal/comtest.c
index 7eecd41634..faee1bfa45 100644
--- a/Demo/Common/Minimal/comtest.c
+++ b/Demo/Common/Minimal/comtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/countsem.c b/Demo/Common/Minimal/countsem.c
index 49db965f57..0b6f612728 100644
--- a/Demo/Common/Minimal/countsem.c
+++ b/Demo/Common/Minimal/countsem.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/crflash.c b/Demo/Common/Minimal/crflash.c
index 56801b4591..3cbee358ee 100644
--- a/Demo/Common/Minimal/crflash.c
+++ b/Demo/Common/Minimal/crflash.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/crhook.c b/Demo/Common/Minimal/crhook.c
index 3a429cb905..0d8a6b3fee 100644
--- a/Demo/Common/Minimal/crhook.c
+++ b/Demo/Common/Minimal/crhook.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/death.c b/Demo/Common/Minimal/death.c
index c047fd9c06..25a66a0679 100644
--- a/Demo/Common/Minimal/death.c
+++ b/Demo/Common/Minimal/death.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/dynamic.c b/Demo/Common/Minimal/dynamic.c
index c55a2505a7..382ad7bc0a 100644
--- a/Demo/Common/Minimal/dynamic.c
+++ b/Demo/Common/Minimal/dynamic.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/flash.c b/Demo/Common/Minimal/flash.c
index 4c54457b3b..3bf1184c3a 100644
--- a/Demo/Common/Minimal/flash.c
+++ b/Demo/Common/Minimal/flash.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/flop.c b/Demo/Common/Minimal/flop.c
index 5cc4f94311..c38b137444 100644
--- a/Demo/Common/Minimal/flop.c
+++ b/Demo/Common/Minimal/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/integer.c b/Demo/Common/Minimal/integer.c
index b05c2853ba..49d2db4cab 100644
--- a/Demo/Common/Minimal/integer.c
+++ b/Demo/Common/Minimal/integer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/recmutex.c b/Demo/Common/Minimal/recmutex.c
index 0c36a713af..a8334c342a 100644
--- a/Demo/Common/Minimal/recmutex.c
+++ b/Demo/Common/Minimal/recmutex.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/Minimal/semtest.c b/Demo/Common/Minimal/semtest.c
index 472d16a52e..8495a9364a 100644
--- a/Demo/Common/Minimal/semtest.c
+++ b/Demo/Common/Minimal/semtest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/AltBlckQ.h b/Demo/Common/include/AltBlckQ.h
index c066232e20..199e43a1f3 100644
--- a/Demo/Common/include/AltBlckQ.h
+++ b/Demo/Common/include/AltBlckQ.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/AltBlock.h b/Demo/Common/include/AltBlock.h
index bade337f8d..e3cc4e1af1 100644
--- a/Demo/Common/include/AltBlock.h
+++ b/Demo/Common/include/AltBlock.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/AltPollQ.h b/Demo/Common/include/AltPollQ.h
index 6a70395697..01928e976a 100644
--- a/Demo/Common/include/AltPollQ.h
+++ b/Demo/Common/include/AltPollQ.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/AltQTest.h b/Demo/Common/include/AltQTest.h
index 60c6e4765d..e4458c8475 100644
--- a/Demo/Common/include/AltQTest.h
+++ b/Demo/Common/include/AltQTest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/BlockQ.h b/Demo/Common/include/BlockQ.h
index e8981114c8..973a8f3a7e 100644
--- a/Demo/Common/include/BlockQ.h
+++ b/Demo/Common/include/BlockQ.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/GenQTest.h b/Demo/Common/include/GenQTest.h
index e895966c60..fc80c5a99e 100644
--- a/Demo/Common/include/GenQTest.h
+++ b/Demo/Common/include/GenQTest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/IntQueue.h b/Demo/Common/include/IntQueue.h
index 5fcc1b51e8..eef35cab16 100644
--- a/Demo/Common/include/IntQueue.h
+++ b/Demo/Common/include/IntQueue.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/PollQ.h b/Demo/Common/include/PollQ.h
index b093aef6f2..6f47985fcf 100644
--- a/Demo/Common/include/PollQ.h
+++ b/Demo/Common/include/PollQ.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/QPeek.h b/Demo/Common/include/QPeek.h
index c004ece7ca..f7298e07ef 100644
--- a/Demo/Common/include/QPeek.h
+++ b/Demo/Common/include/QPeek.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/blocktim.h b/Demo/Common/include/blocktim.h
index 342c04aad2..aa1cc01b71 100644
--- a/Demo/Common/include/blocktim.h
+++ b/Demo/Common/include/blocktim.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/comtest.h b/Demo/Common/include/comtest.h
index b17e0aede7..b1ad475d19 100644
--- a/Demo/Common/include/comtest.h
+++ b/Demo/Common/include/comtest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/comtest2.h b/Demo/Common/include/comtest2.h
index 0ff0eb7089..1881d34865 100644
--- a/Demo/Common/include/comtest2.h
+++ b/Demo/Common/include/comtest2.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/countsem.h b/Demo/Common/include/countsem.h
index a68d28f646..086262b47d 100644
--- a/Demo/Common/include/countsem.h
+++ b/Demo/Common/include/countsem.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/crflash.h b/Demo/Common/include/crflash.h
index 2829f39bb0..6810446468 100644
--- a/Demo/Common/include/crflash.h
+++ b/Demo/Common/include/crflash.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/crhook.h b/Demo/Common/include/crhook.h
index aed97ece2d..4c57a5cbe5 100644
--- a/Demo/Common/include/crhook.h
+++ b/Demo/Common/include/crhook.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/death.h b/Demo/Common/include/death.h
index 6e7d4c7b03..e3b413f857 100644
--- a/Demo/Common/include/death.h
+++ b/Demo/Common/include/death.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/dynamic.h b/Demo/Common/include/dynamic.h
index 6f710e0988..793e8bc6c6 100644
--- a/Demo/Common/include/dynamic.h
+++ b/Demo/Common/include/dynamic.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/fileIO.h b/Demo/Common/include/fileIO.h
index 26a4daca98..462b12d05f 100644
--- a/Demo/Common/include/fileIO.h
+++ b/Demo/Common/include/fileIO.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/flash.h b/Demo/Common/include/flash.h
index b721dcbb69..92735b7ee2 100644
--- a/Demo/Common/include/flash.h
+++ b/Demo/Common/include/flash.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/flop.h b/Demo/Common/include/flop.h
index 0a54698b47..38f4d94485 100644
--- a/Demo/Common/include/flop.h
+++ b/Demo/Common/include/flop.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/integer.h b/Demo/Common/include/integer.h
index 111d12e2c4..2022ed0fea 100644
--- a/Demo/Common/include/integer.h
+++ b/Demo/Common/include/integer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/mevents.h b/Demo/Common/include/mevents.h
index 4ed1d8004f..0e2d57be18 100644
--- a/Demo/Common/include/mevents.h
+++ b/Demo/Common/include/mevents.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/partest.h b/Demo/Common/include/partest.h
index deba384ac6..0f5e2f4140 100644
--- a/Demo/Common/include/partest.h
+++ b/Demo/Common/include/partest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/print.h b/Demo/Common/include/print.h
index c5823e90e1..61df29a03d 100644
--- a/Demo/Common/include/print.h
+++ b/Demo/Common/include/print.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/recmutex.h b/Demo/Common/include/recmutex.h
index f1e071d60e..7a1d544d6b 100644
--- a/Demo/Common/include/recmutex.h
+++ b/Demo/Common/include/recmutex.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/semtest.h b/Demo/Common/include/semtest.h
index 8f4370fd3b..6a5016226d 100644
--- a/Demo/Common/include/semtest.h
+++ b/Demo/Common/include/semtest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Common/include/serial.h b/Demo/Common/include/serial.h
index 54f3498bcb..460303b04c 100644
--- a/Demo/Common/include/serial.h
+++ b/Demo/Common/include/serial.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Cygnal/FreeRTOSConfig.h b/Demo/Cygnal/FreeRTOSConfig.h
index 378c997d7a..d0c228aac3 100644
--- a/Demo/Cygnal/FreeRTOSConfig.h
+++ b/Demo/Cygnal/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Cygnal/Makefile b/Demo/Cygnal/Makefile
index 8642b8a5a3..fa706d21ca 100644
--- a/Demo/Cygnal/Makefile
+++ b/Demo/Cygnal/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/Cygnal/ParTest/ParTest.c b/Demo/Cygnal/ParTest/ParTest.c
index 484eeea14e..2c7b09fff7 100644
--- a/Demo/Cygnal/ParTest/ParTest.c
+++ b/Demo/Cygnal/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Cygnal/main.c b/Demo/Cygnal/main.c
index 9cd3129798..d0af254b7f 100644
--- a/Demo/Cygnal/main.c
+++ b/Demo/Cygnal/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Cygnal/serial/serial.c b/Demo/Cygnal/serial/serial.c
index f73a4c97d5..5a5988a8be 100644
--- a/Demo/Cygnal/serial/serial.c
+++ b/Demo/Cygnal/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/FRConfig.h b/Demo/Flshlite/FRConfig.h
index 2a720db30d..1e2f781b2a 100644
--- a/Demo/Flshlite/FRConfig.h
+++ b/Demo/Flshlite/FRConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/FileIO/fileIO.c b/Demo/Flshlite/FileIO/fileIO.c
index efbbb56652..9bd92d13ca 100644
--- a/Demo/Flshlite/FileIO/fileIO.c
+++ b/Demo/Flshlite/FileIO/fileIO.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/FreeRTOSConfig.h b/Demo/Flshlite/FreeRTOSConfig.h
index b90e06e333..02d85cf22c 100644
--- a/Demo/Flshlite/FreeRTOSConfig.h
+++ b/Demo/Flshlite/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/ParTest/ParTest.c b/Demo/Flshlite/ParTest/ParTest.c
index 9cac934dcb..89e98e1a84 100644
--- a/Demo/Flshlite/ParTest/ParTest.c
+++ b/Demo/Flshlite/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/main.c b/Demo/Flshlite/main.c
index 41e380c31f..9d5fdb9937 100644
--- a/Demo/Flshlite/main.c
+++ b/Demo/Flshlite/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/Flshlite/serial/serial.c b/Demo/Flshlite/serial/serial.c
index e82ef0b356..49f48f3b57 100644
--- a/Demo/Flshlite/serial/serial.c
+++ b/Demo/Flshlite/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/H8S/RTOSDemo/FreeRTOSConfig.h b/Demo/H8S/RTOSDemo/FreeRTOSConfig.h
index f098043a28..619555a4d8 100644
--- a/Demo/H8S/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/H8S/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/H8S/RTOSDemo/ParTest/ParTest.c b/Demo/H8S/RTOSDemo/ParTest/ParTest.c
index 1112b00dfc..b41150f115 100644
--- a/Demo/H8S/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/H8S/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/H8S/RTOSDemo/main.c b/Demo/H8S/RTOSDemo/main.c
index 6dec12f1c1..7c196014ab 100644
--- a/Demo/H8S/RTOSDemo/main.c
+++ b/Demo/H8S/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/H8S/RTOSDemo/serial/serial.c b/Demo/H8S/RTOSDemo/serial/serial.c
index 0243923384..842af61798 100644
--- a/Demo/H8S/RTOSDemo/serial/serial.c
+++ b/Demo/H8S/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_banked/FreeRTOSConfig.h b/Demo/HCS12_CodeWarrior_banked/FreeRTOSConfig.h
index 10cb7face7..7d6f2aa0ef 100644
--- a/Demo/HCS12_CodeWarrior_banked/FreeRTOSConfig.h
+++ b/Demo/HCS12_CodeWarrior_banked/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_banked/ParTest/ParTest.c b/Demo/HCS12_CodeWarrior_banked/ParTest/ParTest.c
index fca2dff4a2..7998a64a84 100644
--- a/Demo/HCS12_CodeWarrior_banked/ParTest/ParTest.c
+++ b/Demo/HCS12_CodeWarrior_banked/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_banked/main.c b/Demo/HCS12_CodeWarrior_banked/main.c
index ecdfc07856..11f9f1dcf9 100644
--- a/Demo/HCS12_CodeWarrior_banked/main.c
+++ b/Demo/HCS12_CodeWarrior_banked/main.c
@@ -1,6 +1,6 @@
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_banked/serial/serial.c b/Demo/HCS12_CodeWarrior_banked/serial/serial.c
index 1677a4bacc..3e600aef4d 100644
--- a/Demo/HCS12_CodeWarrior_banked/serial/serial.c
+++ b/Demo/HCS12_CodeWarrior_banked/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_small/FreeRTOSConfig.h b/Demo/HCS12_CodeWarrior_small/FreeRTOSConfig.h
index 1617694a41..331412dc6f 100644
--- a/Demo/HCS12_CodeWarrior_small/FreeRTOSConfig.h
+++ b/Demo/HCS12_CodeWarrior_small/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_small/ParTest/ParTest.c b/Demo/HCS12_CodeWarrior_small/ParTest/ParTest.c
index fca2dff4a2..7998a64a84 100644
--- a/Demo/HCS12_CodeWarrior_small/ParTest/ParTest.c
+++ b/Demo/HCS12_CodeWarrior_small/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_small/main.c b/Demo/HCS12_CodeWarrior_small/main.c
index 71a008d548..c8c9ac48f8 100644
--- a/Demo/HCS12_CodeWarrior_small/main.c
+++ b/Demo/HCS12_CodeWarrior_small/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_CodeWarrior_small/serial/serial.c b/Demo/HCS12_CodeWarrior_small/serial/serial.c
index 50ce8cfb08..66c7cd1dec 100644
--- a/Demo/HCS12_CodeWarrior_small/serial/serial.c
+++ b/Demo/HCS12_CodeWarrior_small/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_GCC_banked/FreeRTOSConfig.h b/Demo/HCS12_GCC_banked/FreeRTOSConfig.h
index f0eb419fa7..d83b61f961 100644
--- a/Demo/HCS12_GCC_banked/FreeRTOSConfig.h
+++ b/Demo/HCS12_GCC_banked/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_GCC_banked/ParTest.c b/Demo/HCS12_GCC_banked/ParTest.c
index 6abcb3f939..b1626737a2 100644
--- a/Demo/HCS12_GCC_banked/ParTest.c
+++ b/Demo/HCS12_GCC_banked/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_GCC_banked/main.c b/Demo/HCS12_GCC_banked/main.c
index ab05191c36..7c5cdefadf 100644
--- a/Demo/HCS12_GCC_banked/main.c
+++ b/Demo/HCS12_GCC_banked/main.c
@@ -1,6 +1,6 @@
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/HCS12_GCC_banked/startup.c b/Demo/HCS12_GCC_banked/startup.c
index 9e6f1f3322..5407b2ddc0 100644
--- a/Demo/HCS12_GCC_banked/startup.c
+++ b/Demo/HCS12_GCC_banked/startup.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
index 0568d62d09..4690e53f9d 100644
--- a/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
+++ b/Demo/MB91460_Softune/SRC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB91460_Softune/SRC/crflash_modified.c b/Demo/MB91460_Softune/SRC/crflash_modified.c
index aa48d5fec7..007be13603 100644
--- a/Demo/MB91460_Softune/SRC/crflash_modified.c
+++ b/Demo/MB91460_Softune/SRC/crflash_modified.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB91460_Softune/SRC/main.c b/Demo/MB91460_Softune/SRC/main.c
index c31c75d096..9864b0edd2 100644
--- a/Demo/MB91460_Softune/SRC/main.c
+++ b/Demo/MB91460_Softune/SRC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB91460_Softune/SRC/partest/partest.c b/Demo/MB91460_Softune/SRC/partest/partest.c
index 9b03f1050e..741f2b32df 100644
--- a/Demo/MB91460_Softune/SRC/partest/partest.c
+++ b/Demo/MB91460_Softune/SRC/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB91460_Softune/SRC/serial/serial.c b/Demo/MB91460_Softune/SRC/serial/serial.c
index 061613c45f..02d61f5e1b 100644
--- a/Demo/MB91460_Softune/SRC/serial/serial.c
+++ b/Demo/MB91460_Softune/SRC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
index 7a02d60600..5d64b7d7a9 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
index aa48d5fec7..007be13603 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/crflash_sk16fx100mpc.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
index 5e43068e0c..21b3203243 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
index 6f000cb70e..6b9cc02e3d 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
index 932fe93182..68029a27df 100644
--- a/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
+++ b/Demo/MB96340_Softune/FreeRTOS_96348hs_SK16FX100PMC/Src/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/DiceTask.c b/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
index 8d5a81d14f..a96429cb21 100644
--- a/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
+++ b/Demo/MB96350_Softune_Dice_Kit/DiceTask.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/DiceTask.h b/Demo/MB96350_Softune_Dice_Kit/DiceTask.h
index 8066e6dd28..043f30c942 100644
--- a/Demo/MB96350_Softune_Dice_Kit/DiceTask.h
+++ b/Demo/MB96350_Softune_Dice_Kit/DiceTask.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h b/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h
index 786e3329f7..a36f1c44da 100644
--- a/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h
+++ b/Demo/MB96350_Softune_Dice_Kit/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c b/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
index b68c8a8fc3..5580b41d27 100644
--- a/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
+++ b/Demo/MB96350_Softune_Dice_Kit/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c b/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
index eb86d0a22b..5a978bb9cf 100644
--- a/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
+++ b/Demo/MB96350_Softune_Dice_Kit/SegmentToggleTasks.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MB96350_Softune_Dice_Kit/main.c b/Demo/MB96350_Softune_Dice_Kit/main.c
index af537b6c9a..e7b99e5c32 100644
--- a/Demo/MB96350_Softune_Dice_Kit/main.c
+++ b/Demo/MB96350_Softune_Dice_Kit/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MicroBlaze/FreeRTOSConfig.h b/Demo/MicroBlaze/FreeRTOSConfig.h
index 18b9f0c3ef..e6dc6cb83d 100644
--- a/Demo/MicroBlaze/FreeRTOSConfig.h
+++ b/Demo/MicroBlaze/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MicroBlaze/ParTest/ParTest.c b/Demo/MicroBlaze/ParTest/ParTest.c
index ec4c00382e..a560b67771 100644
--- a/Demo/MicroBlaze/ParTest/ParTest.c
+++ b/Demo/MicroBlaze/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MicroBlaze/main.c b/Demo/MicroBlaze/main.c
index fa0c2d9934..7bad5d62d4 100644
--- a/Demo/MicroBlaze/main.c
+++ b/Demo/MicroBlaze/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/MicroBlaze/serial/serial.c b/Demo/MicroBlaze/serial/serial.c
index a46d4fbf45..f6feed8b66 100644
--- a/Demo/MicroBlaze/serial/serial.c
+++ b/Demo/MicroBlaze/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_78K0R_IAR/ButtonISR.s26 b/Demo/NEC_78K0R_IAR/ButtonISR.s26
index 8d0110f530..66505048e8 100644
--- a/Demo/NEC_78K0R_IAR/ButtonISR.s26
+++ b/Demo/NEC_78K0R_IAR/ButtonISR.s26
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/NEC_78K0R_IAR/ButtonTask.c b/Demo/NEC_78K0R_IAR/ButtonTask.c
index cde7050468..4a70760dc6 100644
--- a/Demo/NEC_78K0R_IAR/ButtonTask.c
+++ b/Demo/NEC_78K0R_IAR/ButtonTask.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
index 0afe02df96..4de9931d3d 100644
--- a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_78K0R_IAR/RegTest.s26 b/Demo/NEC_78K0R_IAR/RegTest.s26
index ec15a270e8..f22b9074f2 100644
--- a/Demo/NEC_78K0R_IAR/RegTest.s26
+++ b/Demo/NEC_78K0R_IAR/RegTest.s26
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/NEC_78K0R_IAR/main.c b/Demo/NEC_78K0R_IAR/main.c
index 6f3cf6a637..cd44a7df27 100644
--- a/Demo/NEC_78K0R_IAR/main.c
+++ b/Demo/NEC_78K0R_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h b/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h
index f12319e1ca..add4ab21dd 100644
--- a/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_V850ES_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
index c3dc4d5f9a..0f440fe3d8 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
index 0d533afb0f..12f3ec7baf 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Fx3.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
index 58fb66195a..65e278e64f 100644
--- a/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
+++ b/Demo/NEC_V850ES_IAR/LowLevelInit/LowLevelInit_Hx2.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
index 0d38bd7066..1c9e87a74a 100644
--- a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
+++ b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Fx3_App_Board.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
index 72ef1ab7ab..19f766044c 100644
--- a/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
+++ b/Demo/NEC_V850ES_IAR/ParTest/ParTest_Generic_Target_Board.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/RegTest.s85 b/Demo/NEC_V850ES_IAR/RegTest.s85
index da0eb890c6..05ef4f03b9 100644
--- a/Demo/NEC_V850ES_IAR/RegTest.s85
+++ b/Demo/NEC_V850ES_IAR/RegTest.s85
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/main.c b/Demo/NEC_V850ES_IAR/main.c
index a9be5d0280..3bbba1f6de 100644
--- a/Demo/NEC_V850ES_IAR/main.c
+++ b/Demo/NEC_V850ES_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NEC_V850ES_IAR/serial/serial.c b/Demo/NEC_V850ES_IAR/serial/serial.c
index 1b215c2579..fecee5f882 100644
--- a/Demo/NEC_V850ES_IAR/serial/serial.c
+++ b/Demo/NEC_V850ES_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
index 9b2a7a7612..0bd978311c 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
index 37255257a8..a5b50d2c76 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
index 39c1184cb5..6af0382110 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
index 9cdfb3ae1a..25b4c3c5f8 100644
--- a/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
+++ b/Demo/NiosII_CycloneIII_DBC3C40_GCC/RTOSDemo/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/FRConfig.h b/Demo/PC/FRConfig.h
index f0903a33b0..56ff46e307 100644
--- a/Demo/PC/FRConfig.h
+++ b/Demo/PC/FRConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/FileIO/fileIO.c b/Demo/PC/FileIO/fileIO.c
index 753ec70a9c..6bd923fda6 100644
--- a/Demo/PC/FileIO/fileIO.c
+++ b/Demo/PC/FileIO/fileIO.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/FreeRTOSConfig.h b/Demo/PC/FreeRTOSConfig.h
index 450a4a1307..86ca044410 100644
--- a/Demo/PC/FreeRTOSConfig.h
+++ b/Demo/PC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/ParTest/ParTest.c b/Demo/PC/ParTest/ParTest.c
index 094269e960..bbc8ea7287 100644
--- a/Demo/PC/ParTest/ParTest.c
+++ b/Demo/PC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/main.c b/Demo/PC/main.c
index 3d8096c708..c738c33e5b 100644
--- a/Demo/PC/main.c
+++ b/Demo/PC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PC/serial/serial.c b/Demo/PC/serial/serial.c
index c0c485f0ed..2caaea314d 100644
--- a/Demo/PC/serial/serial.c
+++ b/Demo/PC/serial/serial.c
@@ -6,7 +6,7 @@
 */
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/FreeRTOSConfig.h b/Demo/PIC18_MPLAB/FreeRTOSConfig.h
index 5f93cafd02..a1a8a777cb 100644
--- a/Demo/PIC18_MPLAB/FreeRTOSConfig.h
+++ b/Demo/PIC18_MPLAB/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/ParTest/ParTest.c b/Demo/PIC18_MPLAB/ParTest/ParTest.c
index 6d0d3f4a40..a267e65bd0 100644
--- a/Demo/PIC18_MPLAB/ParTest/ParTest.c
+++ b/Demo/PIC18_MPLAB/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/main1.c b/Demo/PIC18_MPLAB/main1.c
index 79adce1807..97a7e126f1 100644
--- a/Demo/PIC18_MPLAB/main1.c
+++ b/Demo/PIC18_MPLAB/main1.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/main2.c b/Demo/PIC18_MPLAB/main2.c
index cafdcc37cf..848f45d132 100644
--- a/Demo/PIC18_MPLAB/main2.c
+++ b/Demo/PIC18_MPLAB/main2.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/main3.c b/Demo/PIC18_MPLAB/main3.c
index 1649cf589b..43fa2466bc 100644
--- a/Demo/PIC18_MPLAB/main3.c
+++ b/Demo/PIC18_MPLAB/main3.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_MPLAB/serial/serial.c b/Demo/PIC18_MPLAB/serial/serial.c
index 3ff47cd440..86e4d22398 100644
--- a/Demo/PIC18_MPLAB/serial/serial.c
+++ b/Demo/PIC18_MPLAB/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo1/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo1/FreeRTOSConfig.h
index cb3c8767c4..f38b639221 100644
--- a/Demo/PIC18_WizC/Demo1/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo1/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo1/WIZCmake.h b/Demo/PIC18_WizC/Demo1/WIZCmake.h
index 8dccf83308..c134899f0c 100644
--- a/Demo/PIC18_WizC/Demo1/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo1/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo1/fuses.c b/Demo/PIC18_WizC/Demo1/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo1/fuses.c
+++ b/Demo/PIC18_WizC/Demo1/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo1/interrupt.c b/Demo/PIC18_WizC/Demo1/interrupt.c
index e0428d9f38..a43520b212 100644
--- a/Demo/PIC18_WizC/Demo1/interrupt.c
+++ b/Demo/PIC18_WizC/Demo1/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo1/main.c b/Demo/PIC18_WizC/Demo1/main.c
index 5232d0960a..3caa884789 100644
--- a/Demo/PIC18_WizC/Demo1/main.c
+++ b/Demo/PIC18_WizC/Demo1/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo2/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo2/FreeRTOSConfig.h
index 41b550ff63..08abc49184 100644
--- a/Demo/PIC18_WizC/Demo2/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo2/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo2/WIZCmake.h b/Demo/PIC18_WizC/Demo2/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo2/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo2/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo2/fuses.c b/Demo/PIC18_WizC/Demo2/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo2/fuses.c
+++ b/Demo/PIC18_WizC/Demo2/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo2/interrupt.c b/Demo/PIC18_WizC/Demo2/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo2/interrupt.c
+++ b/Demo/PIC18_WizC/Demo2/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo2/main.c b/Demo/PIC18_WizC/Demo2/main.c
index 771d418c0c..82de179f7b 100644
--- a/Demo/PIC18_WizC/Demo2/main.c
+++ b/Demo/PIC18_WizC/Demo2/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo3/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo3/FreeRTOSConfig.h
index afc004c043..b0448b655b 100644
--- a/Demo/PIC18_WizC/Demo3/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo3/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo3/WIZCmake.h b/Demo/PIC18_WizC/Demo3/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo3/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo3/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo3/fuses.c b/Demo/PIC18_WizC/Demo3/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo3/fuses.c
+++ b/Demo/PIC18_WizC/Demo3/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo3/interrupt.c b/Demo/PIC18_WizC/Demo3/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo3/interrupt.c
+++ b/Demo/PIC18_WizC/Demo3/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo3/main.c b/Demo/PIC18_WizC/Demo3/main.c
index b334c12b23..b1bda23952 100644
--- a/Demo/PIC18_WizC/Demo3/main.c
+++ b/Demo/PIC18_WizC/Demo3/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo4/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo4/FreeRTOSConfig.h
index 15d8455175..05ffa491ab 100644
--- a/Demo/PIC18_WizC/Demo4/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo4/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo4/WIZCmake.h b/Demo/PIC18_WizC/Demo4/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo4/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo4/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo4/fuses.c b/Demo/PIC18_WizC/Demo4/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo4/fuses.c
+++ b/Demo/PIC18_WizC/Demo4/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo4/interrupt.c b/Demo/PIC18_WizC/Demo4/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo4/interrupt.c
+++ b/Demo/PIC18_WizC/Demo4/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo4/main.c b/Demo/PIC18_WizC/Demo4/main.c
index 065be655f9..0373200274 100644
--- a/Demo/PIC18_WizC/Demo4/main.c
+++ b/Demo/PIC18_WizC/Demo4/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo5/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo5/FreeRTOSConfig.h
index 4ce13f57f3..98c7d6dc3e 100644
--- a/Demo/PIC18_WizC/Demo5/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo5/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo5/WIZCmake.h b/Demo/PIC18_WizC/Demo5/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo5/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo5/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo5/fuses.c b/Demo/PIC18_WizC/Demo5/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo5/fuses.c
+++ b/Demo/PIC18_WizC/Demo5/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo5/interrupt.c b/Demo/PIC18_WizC/Demo5/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo5/interrupt.c
+++ b/Demo/PIC18_WizC/Demo5/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo5/main.c b/Demo/PIC18_WizC/Demo5/main.c
index c5063f07be..171c58121b 100644
--- a/Demo/PIC18_WizC/Demo5/main.c
+++ b/Demo/PIC18_WizC/Demo5/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo6/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo6/FreeRTOSConfig.h
index f2fecef849..f2756fe46e 100644
--- a/Demo/PIC18_WizC/Demo6/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo6/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo6/WIZCmake.h b/Demo/PIC18_WizC/Demo6/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo6/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo6/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo6/fuses.c b/Demo/PIC18_WizC/Demo6/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo6/fuses.c
+++ b/Demo/PIC18_WizC/Demo6/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo6/interrupt.c b/Demo/PIC18_WizC/Demo6/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo6/interrupt.c
+++ b/Demo/PIC18_WizC/Demo6/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo6/main.c b/Demo/PIC18_WizC/Demo6/main.c
index 162e0d23f6..0ca71a734e 100644
--- a/Demo/PIC18_WizC/Demo6/main.c
+++ b/Demo/PIC18_WizC/Demo6/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo7/FreeRTOSConfig.h b/Demo/PIC18_WizC/Demo7/FreeRTOSConfig.h
index 49ec6ef49f..fc03031ef8 100644
--- a/Demo/PIC18_WizC/Demo7/FreeRTOSConfig.h
+++ b/Demo/PIC18_WizC/Demo7/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo7/WIZCmake.h b/Demo/PIC18_WizC/Demo7/WIZCmake.h
index ae9315b860..04a51ab18e 100644
--- a/Demo/PIC18_WizC/Demo7/WIZCmake.h
+++ b/Demo/PIC18_WizC/Demo7/WIZCmake.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo7/fuses.c b/Demo/PIC18_WizC/Demo7/fuses.c
index 180a5ba130..e153e1105a 100644
--- a/Demo/PIC18_WizC/Demo7/fuses.c
+++ b/Demo/PIC18_WizC/Demo7/fuses.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo7/interrupt.c b/Demo/PIC18_WizC/Demo7/interrupt.c
index 818c5cb84a..7fd79899d3 100644
--- a/Demo/PIC18_WizC/Demo7/interrupt.c
+++ b/Demo/PIC18_WizC/Demo7/interrupt.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/Demo7/main.c b/Demo/PIC18_WizC/Demo7/main.c
index 7e906a122f..8ad697c865 100644
--- a/Demo/PIC18_WizC/Demo7/main.c
+++ b/Demo/PIC18_WizC/Demo7/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/ParTest/ParTest.c b/Demo/PIC18_WizC/ParTest/ParTest.c
index bb4ade60c2..82a1132aa1 100644
--- a/Demo/PIC18_WizC/ParTest/ParTest.c
+++ b/Demo/PIC18_WizC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/serial/isrSerialRx.c b/Demo/PIC18_WizC/serial/isrSerialRx.c
index 908df32e7a..e31ac73b8a 100644
--- a/Demo/PIC18_WizC/serial/isrSerialRx.c
+++ b/Demo/PIC18_WizC/serial/isrSerialRx.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/serial/isrSerialTx.c b/Demo/PIC18_WizC/serial/isrSerialTx.c
index a6a49bc29c..7fd1060883 100644
--- a/Demo/PIC18_WizC/serial/isrSerialTx.c
+++ b/Demo/PIC18_WizC/serial/isrSerialTx.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC18_WizC/serial/serial.c b/Demo/PIC18_WizC/serial/serial.c
index 01ab9a0210..09a941b804 100644
--- a/Demo/PIC18_WizC/serial/serial.c
+++ b/Demo/PIC18_WizC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/FreeRTOSConfig.h b/Demo/PIC24_MPLAB/FreeRTOSConfig.h
index d208343862..cc9493231a 100644
--- a/Demo/PIC24_MPLAB/FreeRTOSConfig.h
+++ b/Demo/PIC24_MPLAB/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/ParTest/ParTest.c b/Demo/PIC24_MPLAB/ParTest/ParTest.c
index 95611b8447..83033355af 100644
--- a/Demo/PIC24_MPLAB/ParTest/ParTest.c
+++ b/Demo/PIC24_MPLAB/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/lcd.c b/Demo/PIC24_MPLAB/lcd.c
index a082c44c41..02bc88ea4b 100644
--- a/Demo/PIC24_MPLAB/lcd.c
+++ b/Demo/PIC24_MPLAB/lcd.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/lcd.h b/Demo/PIC24_MPLAB/lcd.h
index 9a80d11ffc..7470f7c9ad 100644
--- a/Demo/PIC24_MPLAB/lcd.h
+++ b/Demo/PIC24_MPLAB/lcd.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/main.c b/Demo/PIC24_MPLAB/main.c
index b7d7022826..a69701b4a7 100644
--- a/Demo/PIC24_MPLAB/main.c
+++ b/Demo/PIC24_MPLAB/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/serial/serial.c b/Demo/PIC24_MPLAB/serial/serial.c
index 358558548b..f3e6194082 100644
--- a/Demo/PIC24_MPLAB/serial/serial.c
+++ b/Demo/PIC24_MPLAB/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/timertest.c b/Demo/PIC24_MPLAB/timertest.c
index f215ef07bf..89c3f18f88 100644
--- a/Demo/PIC24_MPLAB/timertest.c
+++ b/Demo/PIC24_MPLAB/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC24_MPLAB/timertest.h b/Demo/PIC24_MPLAB/timertest.h
index ed8f71c6d0..f1ac07f8ec 100644
--- a/Demo/PIC24_MPLAB/timertest.h
+++ b/Demo/PIC24_MPLAB/timertest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/FreeRTOSConfig.h b/Demo/PIC32MX_MPLAB/FreeRTOSConfig.h
index 68a6416536..74ca69e049 100644
--- a/Demo/PIC32MX_MPLAB/FreeRTOSConfig.h
+++ b/Demo/PIC32MX_MPLAB/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/IntQueueTimer.c b/Demo/PIC32MX_MPLAB/IntQueueTimer.c
index e12908d84f..f740753037 100644
--- a/Demo/PIC32MX_MPLAB/IntQueueTimer.c
+++ b/Demo/PIC32MX_MPLAB/IntQueueTimer.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/IntQueueTimer.h b/Demo/PIC32MX_MPLAB/IntQueueTimer.h
index f88b1d3e00..876a928a9f 100644
--- a/Demo/PIC32MX_MPLAB/IntQueueTimer.h
+++ b/Demo/PIC32MX_MPLAB/IntQueueTimer.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/IntQueueTimer_isr.S b/Demo/PIC32MX_MPLAB/IntQueueTimer_isr.S
index acaa5abe9e..342db88210 100644
--- a/Demo/PIC32MX_MPLAB/IntQueueTimer_isr.S
+++ b/Demo/PIC32MX_MPLAB/IntQueueTimer_isr.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/ParTest/ParTest.c b/Demo/PIC32MX_MPLAB/ParTest/ParTest.c
index b10805ff6f..4d76e9d680 100644
--- a/Demo/PIC32MX_MPLAB/ParTest/ParTest.c
+++ b/Demo/PIC32MX_MPLAB/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/RegisterTestTasks.s b/Demo/PIC32MX_MPLAB/RegisterTestTasks.s
index 6006d0db58..b9219141c5 100644
--- a/Demo/PIC32MX_MPLAB/RegisterTestTasks.s
+++ b/Demo/PIC32MX_MPLAB/RegisterTestTasks.s
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/lcd.c b/Demo/PIC32MX_MPLAB/lcd.c
index 3af9ff8713..eca03c2473 100644
--- a/Demo/PIC32MX_MPLAB/lcd.c
+++ b/Demo/PIC32MX_MPLAB/lcd.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/lcd.h b/Demo/PIC32MX_MPLAB/lcd.h
index 9a80d11ffc..7470f7c9ad 100644
--- a/Demo/PIC32MX_MPLAB/lcd.h
+++ b/Demo/PIC32MX_MPLAB/lcd.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/main.c b/Demo/PIC32MX_MPLAB/main.c
index 2ffa4a3b70..d2a1b89eff 100644
--- a/Demo/PIC32MX_MPLAB/main.c
+++ b/Demo/PIC32MX_MPLAB/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/serial/serial.c b/Demo/PIC32MX_MPLAB/serial/serial.c
index cb0c010906..3f3aa0ab69 100644
--- a/Demo/PIC32MX_MPLAB/serial/serial.c
+++ b/Demo/PIC32MX_MPLAB/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/timertest.c b/Demo/PIC32MX_MPLAB/timertest.c
index e80ecccaf9..59eb2525b6 100644
--- a/Demo/PIC32MX_MPLAB/timertest.c
+++ b/Demo/PIC32MX_MPLAB/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/timertest.h b/Demo/PIC32MX_MPLAB/timertest.h
index ed8f71c6d0..f1ac07f8ec 100644
--- a/Demo/PIC32MX_MPLAB/timertest.h
+++ b/Demo/PIC32MX_MPLAB/timertest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PIC32MX_MPLAB/timertest_isr.S b/Demo/PIC32MX_MPLAB/timertest_isr.S
index f5ef7ba677..7751637229 100644
--- a/Demo/PIC32MX_MPLAB/timertest_isr.S
+++ b/Demo/PIC32MX_MPLAB/timertest_isr.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
index cd69149c19..7cd20335f0 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
index 7606eb94aa..d6e83d798a 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
index 218431e730..c1b3a1f8fa 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
index 77fa596bca..cd45aa2b2d 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
index 9340ec2c85..a677f5eda7 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
index ef38c17559..d9dc3f1bdc 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
index 1eaf7c7ff2..dbc9da7673 100644
--- a/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
+++ b/Demo/PPC405_FPU_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
index 7b44145795..b0bd8dcc17 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
index 7606eb94aa..d6e83d798a 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
index 218431e730..c1b3a1f8fa 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop-reg-test.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
index 77fa596bca..cd45aa2b2d 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/flop/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c
index 9026eb6370..2f240f4b0b 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
index ef38c17559..d9dc3f1bdc 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
index 1eaf7c7ff2..dbc9da7673 100644
--- a/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
+++ b/Demo/PPC405_Xilinx_Virtex4_GCC/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
index 7278fb6bf6..fd4a006dfa 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
index 18da6f9288..b211ad50e5 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
index 218431e730..c1b3a1f8fa 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
index 578c7672e2..9b9a889349 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
index 21f6d4f22e..db8b06bb8e 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
index c8e0d8a725..60c0f52128 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
index 26c18456a5..0d779ea90c 100644
--- a/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
+++ b/Demo/PPC440_DP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
index 7278fb6bf6..fd4a006dfa 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
index d1bc28fdd8..e07fcce7ba 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
index 218431e730..c1b3a1f8fa 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
index 400f27f370..7ba77421cc 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
index e93a9dbe19..17893c364b 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
index c8e0d8a725..60c0f52128 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
index 26c18456a5..0d779ea90c 100644
--- a/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
+++ b/Demo/PPC440_SP_FPU_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
index a79da24e53..62f6691332 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
index d1bc28fdd8..e07fcce7ba 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
index 218431e730..c1b3a1f8fa 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop-reg-test.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
index 400f27f370..7ba77421cc 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/flop/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/main.c b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/main.c
index 096cd2dc4e..529b1a278a 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/main.c
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
index 904cce1f93..80a0a3cbe0 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/partest/partest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
index 26c18456a5..0d779ea90c 100644
--- a/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
+++ b/Demo/PPC440_Xilinx_Virtex5_GCC/RTOSDemo/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h b/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h
index dda3d5a725..9ee88ec11d 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/ParTest/ParTest.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/ParTest/ParTest.c
index a014c01ab1..1f0ddc2556 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/ParTest/ParTest.c
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/flop.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/flop.c
index c89bd3981c..47f5329a98 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/flop.c
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/flop.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c
index bc5db31242..e916b974cf 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/regtest.src b/Demo/SuperH_SH7216_Renesas/RTOSDemo/regtest.src
index b6f17dce7f..cf15b08794 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/regtest.src
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/regtest.src
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/uIP_Task.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/uIP_Task.c
index e9a13597c3..422544bd34 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/uIP_Task.c
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/uIP_Task.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC.c b/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC.c
index 8d23e11ea3..106a439e15 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC.c
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC_ISR.src b/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC_ISR.src
index 073a02d32c..db75ad081c 100644
--- a/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC_ISR.src
+++ b/Demo/SuperH_SH7216_Renesas/RTOSDemo/webserver/EMAC_ISR.src
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/FreeRTOSConfig.h b/Demo/WizNET_DEMO_GCC_ARM7/FreeRTOSConfig.h
index 3d16ccc35d..62dffc5889 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/FreeRTOSConfig.h
+++ b/Demo/WizNET_DEMO_GCC_ARM7/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.c b/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.c
index 8d3c2397cc..2206764726 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.h b/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.h
index d4853f954c..a1b728a1a0 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.h
+++ b/Demo/WizNET_DEMO_GCC_ARM7/HTTP_Serv.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/Makefile b/Demo/WizNET_DEMO_GCC_ARM7/Makefile
index b5bb2851f9..76750031b2 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/Makefile
+++ b/Demo/WizNET_DEMO_GCC_ARM7/Makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/TCP.c b/Demo/WizNET_DEMO_GCC_ARM7/TCP.c
index f9f5a0d403..5c673163b7 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/TCP.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/TCP.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/TCP.h b/Demo/WizNET_DEMO_GCC_ARM7/TCP.h
index 0e4652c74c..a2df47b801 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/TCP.h
+++ b/Demo/WizNET_DEMO_GCC_ARM7/TCP.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/TCPISR.c b/Demo/WizNET_DEMO_GCC_ARM7/TCPISR.c
index b93630f9f9..af3e15d047 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/TCPISR.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/TCPISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/html_pages.h b/Demo/WizNET_DEMO_GCC_ARM7/html_pages.h
index 6461dabb45..caa95fa90a 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/html_pages.h
+++ b/Demo/WizNET_DEMO_GCC_ARM7/html_pages.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/i2c.c b/Demo/WizNET_DEMO_GCC_ARM7/i2c.c
index 1d86977f4a..469d4fa5a3 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/i2c.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/i2c.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/i2c.h b/Demo/WizNET_DEMO_GCC_ARM7/i2c.h
index eb7177da23..b72d6e90cf 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/i2c.h
+++ b/Demo/WizNET_DEMO_GCC_ARM7/i2c.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/i2cISR.c b/Demo/WizNET_DEMO_GCC_ARM7/i2cISR.c
index 0772bfabab..feb82feda6 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/i2cISR.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/i2cISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_GCC_ARM7/main.c b/Demo/WizNET_DEMO_GCC_ARM7/main.c
index cd560c5812..8cd30df8f9 100644
--- a/Demo/WizNET_DEMO_GCC_ARM7/main.c
+++ b/Demo/WizNET_DEMO_GCC_ARM7/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h b/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h
index f758051370..d3a32db256 100644
--- a/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h
+++ b/Demo/WizNET_DEMO_TERN_186/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_TERN_186/HTTPTask.c b/Demo/WizNET_DEMO_TERN_186/HTTPTask.c
index d6413e97fd..92b4f7c11d 100644
--- a/Demo/WizNET_DEMO_TERN_186/HTTPTask.c
+++ b/Demo/WizNET_DEMO_TERN_186/HTTPTask.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_TERN_186/HTTPTask.h b/Demo/WizNET_DEMO_TERN_186/HTTPTask.h
index 47aea4b9e9..c5c0e09e60 100644
--- a/Demo/WizNET_DEMO_TERN_186/HTTPTask.h
+++ b/Demo/WizNET_DEMO_TERN_186/HTTPTask.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_TERN_186/main.c b/Demo/WizNET_DEMO_TERN_186/main.c
index 1af06957ab..c3938628e2 100644
--- a/Demo/WizNET_DEMO_TERN_186/main.c
+++ b/Demo/WizNET_DEMO_TERN_186/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/WizNET_DEMO_TERN_186/serial/serial.c b/Demo/WizNET_DEMO_TERN_186/serial/serial.c
index a31ff49e4f..e417769cc8 100644
--- a/Demo/WizNET_DEMO_TERN_186/serial/serial.c
+++ b/Demo/WizNET_DEMO_TERN_186/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/FreeRTOSConfig.h b/Demo/dsPIC_MPLAB/FreeRTOSConfig.h
index 1bc6ca1542..9176d03592 100644
--- a/Demo/dsPIC_MPLAB/FreeRTOSConfig.h
+++ b/Demo/dsPIC_MPLAB/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/ParTest/ParTest.c b/Demo/dsPIC_MPLAB/ParTest/ParTest.c
index 24286d221a..c27c1afb35 100644
--- a/Demo/dsPIC_MPLAB/ParTest/ParTest.c
+++ b/Demo/dsPIC_MPLAB/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/lcd.c b/Demo/dsPIC_MPLAB/lcd.c
index 45d1ba049e..7410d6ff6f 100644
--- a/Demo/dsPIC_MPLAB/lcd.c
+++ b/Demo/dsPIC_MPLAB/lcd.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/lcd.h b/Demo/dsPIC_MPLAB/lcd.h
index 9a80d11ffc..7470f7c9ad 100644
--- a/Demo/dsPIC_MPLAB/lcd.h
+++ b/Demo/dsPIC_MPLAB/lcd.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/main.c b/Demo/dsPIC_MPLAB/main.c
index b7d7022826..a69701b4a7 100644
--- a/Demo/dsPIC_MPLAB/main.c
+++ b/Demo/dsPIC_MPLAB/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/serial/serial.c b/Demo/dsPIC_MPLAB/serial/serial.c
index 7303954298..aba9f98222 100644
--- a/Demo/dsPIC_MPLAB/serial/serial.c
+++ b/Demo/dsPIC_MPLAB/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/timertest.c b/Demo/dsPIC_MPLAB/timertest.c
index f215ef07bf..89c3f18f88 100644
--- a/Demo/dsPIC_MPLAB/timertest.c
+++ b/Demo/dsPIC_MPLAB/timertest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/dsPIC_MPLAB/timertest.h b/Demo/dsPIC_MPLAB/timertest.h
index ed8f71c6d0..f1ac07f8ec 100644
--- a/Demo/dsPIC_MPLAB/timertest.h
+++ b/Demo/dsPIC_MPLAB/timertest.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.c b/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.c
index 3d9e11f775..55395b096d 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.h b/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.h
index 6c7ac6008f..50e475050e 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/BasicWEB.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
index 4734a8980e..70d4fa17a7 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h
index bef983ae58..f5297a848a 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC_ISR.c b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC_ISR.c
index e22af54279..d0ea1b668b 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC_ISR.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/EMAC/SAM7_EMAC_ISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h b/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
index 063c233038..2f3b2587a7 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/ParTest/ParTest.c b/Demo/lwIP_Demo_Rowley_ARM7/ParTest/ParTest.c
index 52dcc9c1a7..7a8ce52d68 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/ParTest/ParTest.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c b/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
index d1be06c9bf..b615f85534 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.h b/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.h
index 7b4afeedc1..5790d7f52c 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/USB/USB-CDC.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/USB/USBIsr.c b/Demo/lwIP_Demo_Rowley_ARM7/USB/USBIsr.c
index 7a128fd994..90be02ae45 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/USB/USBIsr.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/USB/USBIsr.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/USB/descriptors.h b/Demo/lwIP_Demo_Rowley_ARM7/USB/descriptors.h
index 93b9ba2520..9055afe116 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/USB/descriptors.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/USB/descriptors.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/USB/usb.h b/Demo/lwIP_Demo_Rowley_ARM7/USB/usb.h
index 2e08b57287..5e1e830a2c 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/USB/usb.h
+++ b/Demo/lwIP_Demo_Rowley_ARM7/USB/usb.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/main.c b/Demo/lwIP_Demo_Rowley_ARM7/main.c
index 9463b06e26..1b8d86ac99 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/main.c
+++ b/Demo/lwIP_Demo_Rowley_ARM7/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/lwIP_Demo_Rowley_ARM7/makefile b/Demo/lwIP_Demo_Rowley_ARM7/makefile
index 47f7b75c83..8cbf2ae053 100644
--- a/Demo/lwIP_Demo_Rowley_ARM7/makefile
+++ b/Demo/lwIP_Demo_Rowley_ARM7/makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/msp430_CrossWorks/FreeRTOSConfig.h b/Demo/msp430_CrossWorks/FreeRTOSConfig.h
index ff96f70d0c..a01a0a6ab1 100644
--- a/Demo/msp430_CrossWorks/FreeRTOSConfig.h
+++ b/Demo/msp430_CrossWorks/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_CrossWorks/ParTest/ParTest.c b/Demo/msp430_CrossWorks/ParTest/ParTest.c
index b3fbd4af0a..eeba20421c 100644
--- a/Demo/msp430_CrossWorks/ParTest/ParTest.c
+++ b/Demo/msp430_CrossWorks/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_CrossWorks/main.c b/Demo/msp430_CrossWorks/main.c
index 05c50d8113..cb87c8904e 100644
--- a/Demo/msp430_CrossWorks/main.c
+++ b/Demo/msp430_CrossWorks/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_CrossWorks/serial/serial.c b/Demo/msp430_CrossWorks/serial/serial.c
index d0f7216405..8f90fc87ae 100644
--- a/Demo/msp430_CrossWorks/serial/serial.c
+++ b/Demo/msp430_CrossWorks/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_CrossWorks/serial/serialASM.asm b/Demo/msp430_CrossWorks/serial/serialASM.asm
index aab3132423..750d7eb5b5 100644
--- a/Demo/msp430_CrossWorks/serial/serialASM.asm
+++ b/Demo/msp430_CrossWorks/serial/serialASM.asm
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_GCC/FreeRTOSConfig.h b/Demo/msp430_GCC/FreeRTOSConfig.h
index 3b7cc287d2..641294d6d3 100644
--- a/Demo/msp430_GCC/FreeRTOSConfig.h
+++ b/Demo/msp430_GCC/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_GCC/ParTest/ParTest.c b/Demo/msp430_GCC/ParTest/ParTest.c
index 087f3380a1..a3e3b91df2 100644
--- a/Demo/msp430_GCC/ParTest/ParTest.c
+++ b/Demo/msp430_GCC/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_GCC/main.c b/Demo/msp430_GCC/main.c
index 78dc60ab1a..4dc229aa04 100644
--- a/Demo/msp430_GCC/main.c
+++ b/Demo/msp430_GCC/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_GCC/makefile b/Demo/msp430_GCC/makefile
index 4f7ff11b25..1b221f4228 100644
--- a/Demo/msp430_GCC/makefile
+++ b/Demo/msp430_GCC/makefile
@@ -1,5 +1,5 @@
 #/*
-#    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+#    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 #
 #    ***************************************************************************
 #    *                                                                         *
diff --git a/Demo/msp430_GCC/serial/serial.c b/Demo/msp430_GCC/serial/serial.c
index 9fcb17948e..235e4e50a8 100644
--- a/Demo/msp430_GCC/serial/serial.c
+++ b/Demo/msp430_GCC/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_IAR/FreeRTOSConfig.h b/Demo/msp430_IAR/FreeRTOSConfig.h
index fb1e9241fc..594ead88b1 100644
--- a/Demo/msp430_IAR/FreeRTOSConfig.h
+++ b/Demo/msp430_IAR/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_IAR/ParTest/ParTest.c b/Demo/msp430_IAR/ParTest/ParTest.c
index df3c068fbd..ee2618caa9 100644
--- a/Demo/msp430_IAR/ParTest/ParTest.c
+++ b/Demo/msp430_IAR/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_IAR/main.c b/Demo/msp430_IAR/main.c
index befb021f1b..ca8d2f071e 100644
--- a/Demo/msp430_IAR/main.c
+++ b/Demo/msp430_IAR/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_IAR/serial/serial.c b/Demo/msp430_IAR/serial/serial.c
index 2e81a483ce..836fcc0f69 100644
--- a/Demo/msp430_IAR/serial/serial.c
+++ b/Demo/msp430_IAR/serial/serial.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/msp430_IAR/serial/serialASM.s43 b/Demo/msp430_IAR/serial/serialASM.s43
index 6d44863b26..fc3a5000a2 100644
--- a/Demo/msp430_IAR/serial/serialASM.s43
+++ b/Demo/msp430_IAR/serial/serialASM.s43
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_IAR_ARM7/EMAC/EMAClISR.s79 b/Demo/uIP_Demo_IAR_ARM7/EMAC/EMAClISR.s79
index ab5bb788d7..1bc3d5e899 100644
--- a/Demo/uIP_Demo_IAR_ARM7/EMAC/EMAClISR.s79
+++ b/Demo/uIP_Demo_IAR_ARM7/EMAC/EMAClISR.s79
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_IAR_ARM7/EMAC/SAM7_EMAC.c b/Demo/uIP_Demo_IAR_ARM7/EMAC/SAM7_EMAC.c
index 3cdf0c6974..c6d53f6d42 100644
--- a/Demo/uIP_Demo_IAR_ARM7/EMAC/SAM7_EMAC.c
+++ b/Demo/uIP_Demo_IAR_ARM7/EMAC/SAM7_EMAC.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h b/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h
index cb628021d5..20cbdaa54f 100644
--- a/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h
+++ b/Demo/uIP_Demo_IAR_ARM7/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_IAR_ARM7/ParTest/ParTest.c b/Demo/uIP_Demo_IAR_ARM7/ParTest/ParTest.c
index fa84e96e7e..662180cc83 100644
--- a/Demo/uIP_Demo_IAR_ARM7/ParTest/ParTest.c
+++ b/Demo/uIP_Demo_IAR_ARM7/ParTest/ParTest.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_IAR_ARM7/main.c b/Demo/uIP_Demo_IAR_ARM7/main.c
index 66d5108d83..ee145af08c 100644
--- a/Demo/uIP_Demo_IAR_ARM7/main.c
+++ b/Demo/uIP_Demo_IAR_ARM7/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_Rowley_ARM7/FreeRTOSConfig.h b/Demo/uIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
index c4ac834be0..3a51458c42 100644
--- a/Demo/uIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
+++ b/Demo/uIP_Demo_Rowley_ARM7/FreeRTOSConfig.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Demo/uIP_Demo_Rowley_ARM7/main.c b/Demo/uIP_Demo_Rowley_ARM7/main.c
index 874bcf8841..d0856cf66b 100644
--- a/Demo/uIP_Demo_Rowley_ARM7/main.c
+++ b/Demo/uIP_Demo_Rowley_ARM7/main.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/croutine.c b/Source/croutine.c
index 15edabea3a..d6f1162625 100644
--- a/Source/croutine.c
+++ b/Source/croutine.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/FreeRTOS.h b/Source/include/FreeRTOS.h
index 70c24a9488..ee02592ae4 100644
--- a/Source/include/FreeRTOS.h
+++ b/Source/include/FreeRTOS.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/StackMacros.h b/Source/include/StackMacros.h
index eaa9375da6..a7514d790b 100644
--- a/Source/include/StackMacros.h
+++ b/Source/include/StackMacros.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/croutine.h b/Source/include/croutine.h
index 8fdf6a011c..c189a1e87e 100644
--- a/Source/include/croutine.h
+++ b/Source/include/croutine.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/list.h b/Source/include/list.h
index ebaf12f307..65712836ec 100644
--- a/Source/include/list.h
+++ b/Source/include/list.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/mpu_wrappers.h b/Source/include/mpu_wrappers.h
index 0a41d8ca36..e197d50851 100644
--- a/Source/include/mpu_wrappers.h
+++ b/Source/include/mpu_wrappers.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/portable.h b/Source/include/portable.h
index d4dcd5b4da..c4be323b6a 100644
--- a/Source/include/portable.h
+++ b/Source/include/portable.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/projdefs.h b/Source/include/projdefs.h
index 4f7868c075..25e9560eae 100644
--- a/Source/include/projdefs.h
+++ b/Source/include/projdefs.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/queue.h b/Source/include/queue.h
index 6374c6056b..c26ccc7fef 100644
--- a/Source/include/queue.h
+++ b/Source/include/queue.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/semphr.h b/Source/include/semphr.h
index c04b67be54..3984e4bb92 100644
--- a/Source/include/semphr.h
+++ b/Source/include/semphr.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/include/task.h b/Source/include/task.h
index d997cbf056..df059e001b 100644
--- a/Source/include/task.h
+++ b/Source/include/task.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
@@ -72,7 +72,7 @@ extern "C" {
  * MACROS AND DEFINITIONS
  *----------------------------------------------------------*/
 
-#define tskKERNEL_VERSION_NUMBER "V6.0.3"
+#define tskKERNEL_VERSION_NUMBER "V6.0.4"
 
 /**
  * task. h
diff --git a/Source/list.c b/Source/list.c
index 94a2533915..fe970ee1a1 100644
--- a/Source/list.c
+++ b/Source/list.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/Flsh186/port.c b/Source/portable/BCC/16BitDOS/Flsh186/port.c
index cbbeba4213..93914fd77c 100644
--- a/Source/portable/BCC/16BitDOS/Flsh186/port.c
+++ b/Source/portable/BCC/16BitDOS/Flsh186/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h b/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
index f7c6956248..8b0e6d1882 100644
--- a/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
+++ b/Source/portable/BCC/16BitDOS/Flsh186/prtmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/PC/port.c b/Source/portable/BCC/16BitDOS/PC/port.c
index d1a292f019..cc52532756 100644
--- a/Source/portable/BCC/16BitDOS/PC/port.c
+++ b/Source/portable/BCC/16BitDOS/PC/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/PC/prtmacro.h b/Source/portable/BCC/16BitDOS/PC/prtmacro.h
index 0c05dc99b3..7b9fa52668 100644
--- a/Source/portable/BCC/16BitDOS/PC/prtmacro.h
+++ b/Source/portable/BCC/16BitDOS/PC/prtmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/common/portasm.h b/Source/portable/BCC/16BitDOS/common/portasm.h
index 1235632dfb..55baf60f4b 100644
--- a/Source/portable/BCC/16BitDOS/common/portasm.h
+++ b/Source/portable/BCC/16BitDOS/common/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/BCC/16BitDOS/common/portcomn.c b/Source/portable/BCC/16BitDOS/common/portcomn.c
index 5fb30a0647..c048b11771 100644
--- a/Source/portable/BCC/16BitDOS/common/portcomn.c
+++ b/Source/portable/BCC/16BitDOS/common/portcomn.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V1/port.c b/Source/portable/CodeWarrior/ColdFire_V1/port.c
index 70fa3fce2c..18eb64c9e4 100644
--- a/Source/portable/CodeWarrior/ColdFire_V1/port.c
+++ b/Source/portable/CodeWarrior/ColdFire_V1/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V1/portasm.S b/Source/portable/CodeWarrior/ColdFire_V1/portasm.S
index 12ba417124..f2be909984 100644
--- a/Source/portable/CodeWarrior/ColdFire_V1/portasm.S
+++ b/Source/portable/CodeWarrior/ColdFire_V1/portasm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h b/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
index 1a69b03064..a22ab4a6a5 100644
--- a/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
+++ b/Source/portable/CodeWarrior/ColdFire_V1/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V2/port.c b/Source/portable/CodeWarrior/ColdFire_V2/port.c
index e7f3916eb1..80a897da65 100644
--- a/Source/portable/CodeWarrior/ColdFire_V2/port.c
+++ b/Source/portable/CodeWarrior/ColdFire_V2/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V2/portasm.S b/Source/portable/CodeWarrior/ColdFire_V2/portasm.S
index 73940c6a7c..e1dcead8d1 100644
--- a/Source/portable/CodeWarrior/ColdFire_V2/portasm.S
+++ b/Source/portable/CodeWarrior/ColdFire_V2/portasm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h b/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
index bcda33cc41..533b10c45a 100644
--- a/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
+++ b/Source/portable/CodeWarrior/ColdFire_V2/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/HCS12/port.c b/Source/portable/CodeWarrior/HCS12/port.c
index f7efd9ad89..b8bba9699b 100644
--- a/Source/portable/CodeWarrior/HCS12/port.c
+++ b/Source/portable/CodeWarrior/HCS12/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/CodeWarrior/HCS12/portmacro.h b/Source/portable/CodeWarrior/HCS12/portmacro.h
index 5b2131b42c..9da6a0d837 100644
--- a/Source/portable/CodeWarrior/HCS12/portmacro.h
+++ b/Source/portable/CodeWarrior/HCS12/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91FR40008/port.c b/Source/portable/GCC/ARM7_AT91FR40008/port.c
index ed6a92b6ff..30cf358387 100644
--- a/Source/portable/GCC/ARM7_AT91FR40008/port.c
+++ b/Source/portable/GCC/ARM7_AT91FR40008/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91FR40008/portISR.c b/Source/portable/GCC/ARM7_AT91FR40008/portISR.c
index abcecf8a0b..4e81020d8a 100644
--- a/Source/portable/GCC/ARM7_AT91FR40008/portISR.c
+++ b/Source/portable/GCC/ARM7_AT91FR40008/portISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h b/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
index 37e862be5a..792809b127 100644
--- a/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
+++ b/Source/portable/GCC/ARM7_AT91FR40008/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91SAM7S/port.c b/Source/portable/GCC/ARM7_AT91SAM7S/port.c
index 28a14d9216..0e1d83154e 100644
--- a/Source/portable/GCC/ARM7_AT91SAM7S/port.c
+++ b/Source/portable/GCC/ARM7_AT91SAM7S/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c b/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
index 03b4a27861..aa51db11f8 100644
--- a/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
+++ b/Source/portable/GCC/ARM7_AT91SAM7S/portISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h b/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
index 13443470f3..5fa3911f25 100644
--- a/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
+++ b/Source/portable/GCC/ARM7_AT91SAM7S/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC2000/port.c b/Source/portable/GCC/ARM7_LPC2000/port.c
index 9a98dfc109..4915c29856 100644
--- a/Source/portable/GCC/ARM7_LPC2000/port.c
+++ b/Source/portable/GCC/ARM7_LPC2000/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC2000/portISR.c b/Source/portable/GCC/ARM7_LPC2000/portISR.c
index a7f2973d0c..4ea783acd7 100644
--- a/Source/portable/GCC/ARM7_LPC2000/portISR.c
+++ b/Source/portable/GCC/ARM7_LPC2000/portISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC2000/portmacro.h b/Source/portable/GCC/ARM7_LPC2000/portmacro.h
index 8c2be17497..6b1aa1075f 100644
--- a/Source/portable/GCC/ARM7_LPC2000/portmacro.h
+++ b/Source/portable/GCC/ARM7_LPC2000/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC23xx/port.c b/Source/portable/GCC/ARM7_LPC23xx/port.c
index bcef346ead..e9f93f0ad7 100644
--- a/Source/portable/GCC/ARM7_LPC23xx/port.c
+++ b/Source/portable/GCC/ARM7_LPC23xx/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC23xx/portISR.c b/Source/portable/GCC/ARM7_LPC23xx/portISR.c
index 463ea58a84..20174110ee 100644
--- a/Source/portable/GCC/ARM7_LPC23xx/portISR.c
+++ b/Source/portable/GCC/ARM7_LPC23xx/portISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM7_LPC23xx/portmacro.h b/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
index 7792b9765a..a99facec25 100644
--- a/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
+++ b/Source/portable/GCC/ARM7_LPC23xx/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM_CM3/port.c b/Source/portable/GCC/ARM_CM3/port.c
index a30b7f6f58..f9e0e5ceab 100644
--- a/Source/portable/GCC/ARM_CM3/port.c
+++ b/Source/portable/GCC/ARM_CM3/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM_CM3/portmacro.h b/Source/portable/GCC/ARM_CM3/portmacro.h
index baa6574798..c6c4c14ef3 100644
--- a/Source/portable/GCC/ARM_CM3/portmacro.h
+++ b/Source/portable/GCC/ARM_CM3/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM_CM3_MPU/port.c b/Source/portable/GCC/ARM_CM3_MPU/port.c
index 8ea5c8d1cf..ee8d3b6b0f 100644
--- a/Source/portable/GCC/ARM_CM3_MPU/port.c
+++ b/Source/portable/GCC/ARM_CM3_MPU/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ARM_CM3_MPU/portmacro.h b/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
index 9054fcd1b7..7e68fa33c9 100644
--- a/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
+++ b/Source/portable/GCC/ARM_CM3_MPU/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ATMega323/port.c b/Source/portable/GCC/ATMega323/port.c
index 5327b1b292..76b84c7ab9 100644
--- a/Source/portable/GCC/ATMega323/port.c
+++ b/Source/portable/GCC/ATMega323/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ATMega323/portmacro.h b/Source/portable/GCC/ATMega323/portmacro.h
index 7b22e24f10..5025981551 100644
--- a/Source/portable/GCC/ATMega323/portmacro.h
+++ b/Source/portable/GCC/ATMega323/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/AVR32_UC3/port.c b/Source/portable/GCC/AVR32_UC3/port.c
index e6f45bd98f..a1e866cf9c 100644
--- a/Source/portable/GCC/AVR32_UC3/port.c
+++ b/Source/portable/GCC/AVR32_UC3/port.c
@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/AVR32_UC3/portmacro.h b/Source/portable/GCC/AVR32_UC3/portmacro.h
index 9a9a52b1cb..a4ed2e8221 100644
--- a/Source/portable/GCC/AVR32_UC3/portmacro.h
+++ b/Source/portable/GCC/AVR32_UC3/portmacro.h
@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ColdFire_V2/port.c b/Source/portable/GCC/ColdFire_V2/port.c
index 95eb53bf9b..592cee5540 100644
--- a/Source/portable/GCC/ColdFire_V2/port.c
+++ b/Source/portable/GCC/ColdFire_V2/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ColdFire_V2/portasm.S b/Source/portable/GCC/ColdFire_V2/portasm.S
index 3054ad13ff..91330e45e4 100644
--- a/Source/portable/GCC/ColdFire_V2/portasm.S
+++ b/Source/portable/GCC/ColdFire_V2/portasm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/ColdFire_V2/portmacro.h b/Source/portable/GCC/ColdFire_V2/portmacro.h
index a03faa4a35..4948484add 100644
--- a/Source/portable/GCC/ColdFire_V2/portmacro.h
+++ b/Source/portable/GCC/ColdFire_V2/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/H8S2329/port.c b/Source/portable/GCC/H8S2329/port.c
index 0f1ae74f10..591fb83008 100644
--- a/Source/portable/GCC/H8S2329/port.c
+++ b/Source/portable/GCC/H8S2329/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/H8S2329/portmacro.h b/Source/portable/GCC/H8S2329/portmacro.h
index 0ee9bd715a..bf28113eea 100644
--- a/Source/portable/GCC/H8S2329/portmacro.h
+++ b/Source/portable/GCC/H8S2329/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/HCS12/port.c b/Source/portable/GCC/HCS12/port.c
index 3e3538710f..de4d05f2d5 100644
--- a/Source/portable/GCC/HCS12/port.c
+++ b/Source/portable/GCC/HCS12/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/HCS12/portmacro.h b/Source/portable/GCC/HCS12/portmacro.h
index c0c00aceb0..447f3b37cc 100644
--- a/Source/portable/GCC/HCS12/portmacro.h
+++ b/Source/portable/GCC/HCS12/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/MSP430F449/port.c b/Source/portable/GCC/MSP430F449/port.c
index 28d829d2a2..b1e22fe8a0 100644
--- a/Source/portable/GCC/MSP430F449/port.c
+++ b/Source/portable/GCC/MSP430F449/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/MSP430F449/portmacro.h b/Source/portable/GCC/MSP430F449/portmacro.h
index 390ed6da92..324809f17a 100644
--- a/Source/portable/GCC/MSP430F449/portmacro.h
+++ b/Source/portable/GCC/MSP430F449/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/MicroBlaze/port.c b/Source/portable/GCC/MicroBlaze/port.c
index 7f04420b90..3d29d18be5 100644
--- a/Source/portable/GCC/MicroBlaze/port.c
+++ b/Source/portable/GCC/MicroBlaze/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/MicroBlaze/portmacro.h b/Source/portable/GCC/MicroBlaze/portmacro.h
index af3653c5f7..7b42fd2347 100644
--- a/Source/portable/GCC/MicroBlaze/portmacro.h
+++ b/Source/portable/GCC/MicroBlaze/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/NiosII/port.c b/Source/portable/GCC/NiosII/port.c
index bc1db2536f..ec4aea4259 100644
--- a/Source/portable/GCC/NiosII/port.c
+++ b/Source/portable/GCC/NiosII/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/NiosII/port_asm.S b/Source/portable/GCC/NiosII/port_asm.S
index 8ec84dc142..eee5db2335 100644
--- a/Source/portable/GCC/NiosII/port_asm.S
+++ b/Source/portable/GCC/NiosII/port_asm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/NiosII/portmacro.h b/Source/portable/GCC/NiosII/portmacro.h
index 2a3f7b55a1..a20965a084 100644
--- a/Source/portable/GCC/NiosII/portmacro.h
+++ b/Source/portable/GCC/NiosII/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC405_Xilinx/FPU_Macros.h b/Source/portable/GCC/PPC405_Xilinx/FPU_Macros.h
index c52bb93e48..04f0ef0d61 100644
--- a/Source/portable/GCC/PPC405_Xilinx/FPU_Macros.h
+++ b/Source/portable/GCC/PPC405_Xilinx/FPU_Macros.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC405_Xilinx/port.c b/Source/portable/GCC/PPC405_Xilinx/port.c
index 03ce2aef70..00244489b3 100644
--- a/Source/portable/GCC/PPC405_Xilinx/port.c
+++ b/Source/portable/GCC/PPC405_Xilinx/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC405_Xilinx/portasm.S b/Source/portable/GCC/PPC405_Xilinx/portasm.S
index 343a5ecd76..8c26add1e3 100644
--- a/Source/portable/GCC/PPC405_Xilinx/portasm.S
+++ b/Source/portable/GCC/PPC405_Xilinx/portasm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC405_Xilinx/portmacro.h b/Source/portable/GCC/PPC405_Xilinx/portmacro.h
index 7197d71c8f..3ea1ca628b 100644
--- a/Source/portable/GCC/PPC405_Xilinx/portmacro.h
+++ b/Source/portable/GCC/PPC405_Xilinx/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC440_Xilinx/FPU_Macros.h b/Source/portable/GCC/PPC440_Xilinx/FPU_Macros.h
index c52bb93e48..04f0ef0d61 100644
--- a/Source/portable/GCC/PPC440_Xilinx/FPU_Macros.h
+++ b/Source/portable/GCC/PPC440_Xilinx/FPU_Macros.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC440_Xilinx/port.c b/Source/portable/GCC/PPC440_Xilinx/port.c
index 19784d9b92..24ea55918f 100644
--- a/Source/portable/GCC/PPC440_Xilinx/port.c
+++ b/Source/portable/GCC/PPC440_Xilinx/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC440_Xilinx/portasm.S b/Source/portable/GCC/PPC440_Xilinx/portasm.S
index 343a5ecd76..8c26add1e3 100644
--- a/Source/portable/GCC/PPC440_Xilinx/portasm.S
+++ b/Source/portable/GCC/PPC440_Xilinx/portasm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/PPC440_Xilinx/portmacro.h b/Source/portable/GCC/PPC440_Xilinx/portmacro.h
index 7197d71c8f..3ea1ca628b 100644
--- a/Source/portable/GCC/PPC440_Xilinx/portmacro.h
+++ b/Source/portable/GCC/PPC440_Xilinx/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/STR75x/port.c b/Source/portable/GCC/STR75x/port.c
index 5fd852adee..a8c688ea98 100644
--- a/Source/portable/GCC/STR75x/port.c
+++ b/Source/portable/GCC/STR75x/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/STR75x/portISR.c b/Source/portable/GCC/STR75x/portISR.c
index 578316ad8b..5e62b3d744 100644
--- a/Source/portable/GCC/STR75x/portISR.c
+++ b/Source/portable/GCC/STR75x/portISR.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/GCC/STR75x/portmacro.h b/Source/portable/GCC/STR75x/portmacro.h
index e1c83bf6bb..45413b924c 100644
--- a/Source/portable/GCC/STR75x/portmacro.h
+++ b/Source/portable/GCC/STR75x/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/78K0R/ISR_Support.h b/Source/portable/IAR/78K0R/ISR_Support.h
index 41f7a42f74..71dd8f96e2 100644
--- a/Source/portable/IAR/78K0R/ISR_Support.h
+++ b/Source/portable/IAR/78K0R/ISR_Support.h
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/78K0R/port.c b/Source/portable/IAR/78K0R/port.c
index 834855c1c2..5864cb4f3e 100644
--- a/Source/portable/IAR/78K0R/port.c
+++ b/Source/portable/IAR/78K0R/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/78K0R/portasm.s26 b/Source/portable/IAR/78K0R/portasm.s26
index a758600951..9189a742b9 100644
--- a/Source/portable/IAR/78K0R/portasm.s26
+++ b/Source/portable/IAR/78K0R/portasm.s26
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/78K0R/portmacro.h b/Source/portable/IAR/78K0R/portmacro.h
index 228cae6837..9daf4265d8 100644
--- a/Source/portable/IAR/78K0R/portmacro.h
+++ b/Source/portable/IAR/78K0R/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ARM_CM3/port.c b/Source/portable/IAR/ARM_CM3/port.c
index 0b08c32ddc..7a5d10a315 100644
--- a/Source/portable/IAR/ARM_CM3/port.c
+++ b/Source/portable/IAR/ARM_CM3/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ARM_CM3/portasm.s b/Source/portable/IAR/ARM_CM3/portasm.s
index a465c50502..281268b299 100644
--- a/Source/portable/IAR/ARM_CM3/portasm.s
+++ b/Source/portable/IAR/ARM_CM3/portasm.s
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ARM_CM3/portmacro.h b/Source/portable/IAR/ARM_CM3/portmacro.h
index 4cbd21c860..932038f674 100644
--- a/Source/portable/IAR/ARM_CM3/portmacro.h
+++ b/Source/portable/IAR/ARM_CM3/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ATMega323/port.c b/Source/portable/IAR/ATMega323/port.c
index 5f5f1dc047..623ff5a44e 100644
--- a/Source/portable/IAR/ATMega323/port.c
+++ b/Source/portable/IAR/ATMega323/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ATMega323/portmacro.h b/Source/portable/IAR/ATMega323/portmacro.h
index abdf6a1405..a0479776f8 100644
--- a/Source/portable/IAR/ATMega323/portmacro.h
+++ b/Source/portable/IAR/ATMega323/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/ATMega323/portmacro.s90 b/Source/portable/IAR/ATMega323/portmacro.s90
index 676a8aec98..bf5bc9260a 100644
--- a/Source/portable/IAR/ATMega323/portmacro.s90
+++ b/Source/portable/IAR/ATMega323/portmacro.s90
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/AVR32_UC3/port.c b/Source/portable/IAR/AVR32_UC3/port.c
index 2c0f1e4210..ceacff6516 100644
--- a/Source/portable/IAR/AVR32_UC3/port.c
+++ b/Source/portable/IAR/AVR32_UC3/port.c
@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/AVR32_UC3/portmacro.h b/Source/portable/IAR/AVR32_UC3/portmacro.h
index e214f0f3c0..b026c2f868 100644
--- a/Source/portable/IAR/AVR32_UC3/portmacro.h
+++ b/Source/portable/IAR/AVR32_UC3/portmacro.h
@@ -13,7 +13,7 @@
  *****************************************************************************/
 
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/AtmelSAM7S64/port.c b/Source/portable/IAR/AtmelSAM7S64/port.c
index a9953d730f..8394b45d61 100644
--- a/Source/portable/IAR/AtmelSAM7S64/port.c
+++ b/Source/portable/IAR/AtmelSAM7S64/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/AtmelSAM7S64/portmacro.h b/Source/portable/IAR/AtmelSAM7S64/portmacro.h
index d83f137be9..3c1e7a8603 100644
--- a/Source/portable/IAR/AtmelSAM7S64/portmacro.h
+++ b/Source/portable/IAR/AtmelSAM7S64/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/AtmelSAM9XE/port.c b/Source/portable/IAR/AtmelSAM9XE/port.c
index 2365a31b16..f087cf04b3 100644
--- a/Source/portable/IAR/AtmelSAM9XE/port.c
+++ b/Source/portable/IAR/AtmelSAM9XE/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/AtmelSAM9XE/portmacro.h b/Source/portable/IAR/AtmelSAM9XE/portmacro.h
index 329a8f8616..407e596eec 100644
--- a/Source/portable/IAR/AtmelSAM9XE/portmacro.h
+++ b/Source/portable/IAR/AtmelSAM9XE/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/LPC2000/port.c b/Source/portable/IAR/LPC2000/port.c
index ab7823d72f..d0daa3bb41 100644
--- a/Source/portable/IAR/LPC2000/port.c
+++ b/Source/portable/IAR/LPC2000/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/LPC2000/portmacro.h b/Source/portable/IAR/LPC2000/portmacro.h
index 1244afd5b2..b8209cc25c 100644
--- a/Source/portable/IAR/LPC2000/portmacro.h
+++ b/Source/portable/IAR/LPC2000/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/MSP430/port.c b/Source/portable/IAR/MSP430/port.c
index 5c36c4c645..b2ffa0dce7 100644
--- a/Source/portable/IAR/MSP430/port.c
+++ b/Source/portable/IAR/MSP430/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/MSP430/portasm.h b/Source/portable/IAR/MSP430/portasm.h
index a2e455669e..57f8a2fb90 100644
--- a/Source/portable/IAR/MSP430/portasm.h
+++ b/Source/portable/IAR/MSP430/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/MSP430/portext.s43 b/Source/portable/IAR/MSP430/portext.s43
index 6ffb66b10a..325f96917c 100644
--- a/Source/portable/IAR/MSP430/portext.s43
+++ b/Source/portable/IAR/MSP430/portext.s43
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/MSP430/portmacro.h b/Source/portable/IAR/MSP430/portmacro.h
index 925778c421..edc387a78f 100644
--- a/Source/portable/IAR/MSP430/portmacro.h
+++ b/Source/portable/IAR/MSP430/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR71x/port.c b/Source/portable/IAR/STR71x/port.c
index 4162c4e258..45bfe288f0 100644
--- a/Source/portable/IAR/STR71x/port.c
+++ b/Source/portable/IAR/STR71x/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR71x/portmacro.h b/Source/portable/IAR/STR71x/portmacro.h
index d10b4adf69..45a47d5b63 100644
--- a/Source/portable/IAR/STR71x/portmacro.h
+++ b/Source/portable/IAR/STR71x/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR75x/ISR_Support.h b/Source/portable/IAR/STR75x/ISR_Support.h
index f1977c2784..ffc81fe7d6 100644
--- a/Source/portable/IAR/STR75x/ISR_Support.h
+++ b/Source/portable/IAR/STR75x/ISR_Support.h
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/STR75x/port.c b/Source/portable/IAR/STR75x/port.c
index bb1a457573..1dbbc002b7 100644
--- a/Source/portable/IAR/STR75x/port.c
+++ b/Source/portable/IAR/STR75x/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR75x/portasm.s79 b/Source/portable/IAR/STR75x/portasm.s79
index a7d97cc763..0412e7b659 100644
--- a/Source/portable/IAR/STR75x/portasm.s79
+++ b/Source/portable/IAR/STR75x/portasm.s79
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/STR75x/portmacro.h b/Source/portable/IAR/STR75x/portmacro.h
index 932964fca4..7f9b5be665 100644
--- a/Source/portable/IAR/STR75x/portmacro.h
+++ b/Source/portable/IAR/STR75x/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR91x/ISR_Support.h b/Source/portable/IAR/STR91x/ISR_Support.h
index 48976faf47..14b80be753 100644
--- a/Source/portable/IAR/STR91x/ISR_Support.h
+++ b/Source/portable/IAR/STR91x/ISR_Support.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR91x/port.c b/Source/portable/IAR/STR91x/port.c
index 5012a4b883..38f1bb5a7e 100644
--- a/Source/portable/IAR/STR91x/port.c
+++ b/Source/portable/IAR/STR91x/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR91x/portasm.s79 b/Source/portable/IAR/STR91x/portasm.s79
index 086efb274f..d4a8c55b4f 100644
--- a/Source/portable/IAR/STR91x/portasm.s79
+++ b/Source/portable/IAR/STR91x/portasm.s79
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/STR91x/portmacro.h b/Source/portable/IAR/STR91x/portmacro.h
index 81b756150e..eddb6b284f 100644
--- a/Source/portable/IAR/STR91x/portmacro.h
+++ b/Source/portable/IAR/STR91x/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/V850ES/ISR_Support.h b/Source/portable/IAR/V850ES/ISR_Support.h
index eb0dd4373e..9824ffab84 100644
--- a/Source/portable/IAR/V850ES/ISR_Support.h
+++ b/Source/portable/IAR/V850ES/ISR_Support.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/V850ES/port.c b/Source/portable/IAR/V850ES/port.c
index bd21a37342..d52019e25e 100644
--- a/Source/portable/IAR/V850ES/port.c
+++ b/Source/portable/IAR/V850ES/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/IAR/V850ES/portasm.s85 b/Source/portable/IAR/V850ES/portasm.s85
index ce01641977..69be792940 100644
--- a/Source/portable/IAR/V850ES/portasm.s85
+++ b/Source/portable/IAR/V850ES/portasm.s85
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/V850ES/portasm_Fx3.s85 b/Source/portable/IAR/V850ES/portasm_Fx3.s85
index 35ddde0e30..a0c9b942fe 100644
--- a/Source/portable/IAR/V850ES/portasm_Fx3.s85
+++ b/Source/portable/IAR/V850ES/portasm_Fx3.s85
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/V850ES/portasm_Hx2.s85 b/Source/portable/IAR/V850ES/portasm_Hx2.s85
index f1cf007852..df6f58be4f 100644
--- a/Source/portable/IAR/V850ES/portasm_Hx2.s85
+++ b/Source/portable/IAR/V850ES/portasm_Hx2.s85
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/IAR/V850ES/portmacro.h b/Source/portable/IAR/V850ES/portmacro.h
index c1fca8c9f0..e5b67aa155 100644
--- a/Source/portable/IAR/V850ES/portmacro.h
+++ b/Source/portable/IAR/V850ES/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC18F/port.c b/Source/portable/MPLAB/PIC18F/port.c
index 969e7bda4d..6fb88ec106 100644
--- a/Source/portable/MPLAB/PIC18F/port.c
+++ b/Source/portable/MPLAB/PIC18F/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC18F/portmacro.h b/Source/portable/MPLAB/PIC18F/portmacro.h
index 8813dfe3a6..1aec334645 100644
--- a/Source/portable/MPLAB/PIC18F/portmacro.h
+++ b/Source/portable/MPLAB/PIC18F/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC24_dsPIC/port.c b/Source/portable/MPLAB/PIC24_dsPIC/port.c
index 4a16bdfe5e..749fc71141 100644
--- a/Source/portable/MPLAB/PIC24_dsPIC/port.c
+++ b/Source/portable/MPLAB/PIC24_dsPIC/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S b/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
index 70cb574f24..9b760ca9f2 100644
--- a/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portasm_PIC24.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S b/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
index d5398361e0..7b6ab2083b 100644
--- a/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portasm_dsPIC.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
index 7f65b8af5c..c97b83a0c3 100644
--- a/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
+++ b/Source/portable/MPLAB/PIC24_dsPIC/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC32MX/ISR_Support.h b/Source/portable/MPLAB/PIC32MX/ISR_Support.h
index f9530e8ea9..b6990dd29b 100644
--- a/Source/portable/MPLAB/PIC32MX/ISR_Support.h
+++ b/Source/portable/MPLAB/PIC32MX/ISR_Support.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC32MX/port.c b/Source/portable/MPLAB/PIC32MX/port.c
index 92388fea75..022f213f48 100644
--- a/Source/portable/MPLAB/PIC32MX/port.c
+++ b/Source/portable/MPLAB/PIC32MX/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC32MX/port_asm.S b/Source/portable/MPLAB/PIC32MX/port_asm.S
index 1de5cd0e8c..8ef5b3167e 100644
--- a/Source/portable/MPLAB/PIC32MX/port_asm.S
+++ b/Source/portable/MPLAB/PIC32MX/port_asm.S
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MPLAB/PIC32MX/portmacro.h b/Source/portable/MPLAB/PIC32MX/portmacro.h
index f3320d8bf6..2e86fc3240 100644
--- a/Source/portable/MPLAB/PIC32MX/portmacro.h
+++ b/Source/portable/MPLAB/PIC32MX/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MemMang/heap_1.c b/Source/portable/MemMang/heap_1.c
index 8126bc7ac7..76742f94d8 100644
--- a/Source/portable/MemMang/heap_1.c
+++ b/Source/portable/MemMang/heap_1.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MemMang/heap_2.c b/Source/portable/MemMang/heap_2.c
index 6e43f9ff03..891405d4b5 100644
--- a/Source/portable/MemMang/heap_2.c
+++ b/Source/portable/MemMang/heap_2.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/MemMang/heap_3.c b/Source/portable/MemMang/heap_3.c
index d5fa6067c8..e4fd22f8a8 100644
--- a/Source/portable/MemMang/heap_3.c
+++ b/Source/portable/MemMang/heap_3.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/large_untested/port.c b/Source/portable/Paradigm/Tern_EE/large_untested/port.c
index 0edc242af7..d5969d5410 100644
--- a/Source/portable/Paradigm/Tern_EE/large_untested/port.c
+++ b/Source/portable/Paradigm/Tern_EE/large_untested/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/large_untested/portasm.h b/Source/portable/Paradigm/Tern_EE/large_untested/portasm.h
index 28e66ddfd0..ac8480e493 100644
--- a/Source/portable/Paradigm/Tern_EE/large_untested/portasm.h
+++ b/Source/portable/Paradigm/Tern_EE/large_untested/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h b/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
index ea46dda9c9..3ebe59ea35 100644
--- a/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
+++ b/Source/portable/Paradigm/Tern_EE/large_untested/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/small/port.c b/Source/portable/Paradigm/Tern_EE/small/port.c
index 817d587b7e..1ac5fb954a 100644
--- a/Source/portable/Paradigm/Tern_EE/small/port.c
+++ b/Source/portable/Paradigm/Tern_EE/small/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/small/portasm.h b/Source/portable/Paradigm/Tern_EE/small/portasm.h
index 9858160283..3980fa87cc 100644
--- a/Source/portable/Paradigm/Tern_EE/small/portasm.h
+++ b/Source/portable/Paradigm/Tern_EE/small/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Paradigm/Tern_EE/small/portmacro.h b/Source/portable/Paradigm/Tern_EE/small/portmacro.h
index 2b4a340347..2fc9e37456 100644
--- a/Source/portable/Paradigm/Tern_EE/small/portmacro.h
+++ b/Source/portable/Paradigm/Tern_EE/small/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/RVDS/ARM7_LPC21xx/port.c b/Source/portable/RVDS/ARM7_LPC21xx/port.c
index 352bd912d9..80ade26707 100644
--- a/Source/portable/RVDS/ARM7_LPC21xx/port.c
+++ b/Source/portable/RVDS/ARM7_LPC21xx/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/RVDS/ARM7_LPC21xx/portASM.s b/Source/portable/RVDS/ARM7_LPC21xx/portASM.s
index d1bbeca8d3..019747576a 100644
--- a/Source/portable/RVDS/ARM7_LPC21xx/portASM.s
+++ b/Source/portable/RVDS/ARM7_LPC21xx/portASM.s
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
index 536a587877..ad5fd05493 100644
--- a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
+++ b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.inc b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.inc
index 5e8f6cb86d..fbf711c2e4 100644
--- a/Source/portable/RVDS/ARM7_LPC21xx/portmacro.inc
+++ b/Source/portable/RVDS/ARM7_LPC21xx/portmacro.inc
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/RVDS/ARM_CM3/port.c b/Source/portable/RVDS/ARM_CM3/port.c
index 9662000161..4ab4ac2e2f 100644
--- a/Source/portable/RVDS/ARM_CM3/port.c
+++ b/Source/portable/RVDS/ARM_CM3/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/RVDS/ARM_CM3/portmacro.h b/Source/portable/RVDS/ARM_CM3/portmacro.h
index a4beb5553b..f9ecf78333 100644
--- a/Source/portable/RVDS/ARM_CM3/portmacro.h
+++ b/Source/portable/RVDS/ARM_CM3/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Renesas/SH2A_FPU/port.c b/Source/portable/Renesas/SH2A_FPU/port.c
index 106d52e67e..8ff9798d03 100644
--- a/Source/portable/Renesas/SH2A_FPU/port.c
+++ b/Source/portable/Renesas/SH2A_FPU/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Renesas/SH2A_FPU/portasm.src b/Source/portable/Renesas/SH2A_FPU/portasm.src
index 2633dc21fa..e67d6ef19b 100644
--- a/Source/portable/Renesas/SH2A_FPU/portasm.src
+++ b/Source/portable/Renesas/SH2A_FPU/portasm.src
@@ -1,5 +1,5 @@
 ;/*
-;    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+;    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 ;
 ;    ***************************************************************************
 ;    *                                                                         *
diff --git a/Source/portable/Renesas/SH2A_FPU/portmacro.h b/Source/portable/Renesas/SH2A_FPU/portmacro.h
index 6919551ae8..a609398534 100644
--- a/Source/portable/Renesas/SH2A_FPU/portmacro.h
+++ b/Source/portable/Renesas/SH2A_FPU/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Rowley/MSP430F449/port.c b/Source/portable/Rowley/MSP430F449/port.c
index c0eeab0c49..d5d3f5ec14 100644
--- a/Source/portable/Rowley/MSP430F449/port.c
+++ b/Source/portable/Rowley/MSP430F449/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Rowley/MSP430F449/portasm.h b/Source/portable/Rowley/MSP430F449/portasm.h
index fe00774a48..534891a2a5 100644
--- a/Source/portable/Rowley/MSP430F449/portasm.h
+++ b/Source/portable/Rowley/MSP430F449/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Rowley/MSP430F449/portext.asm b/Source/portable/Rowley/MSP430F449/portext.asm
index 567b1aa214..de50a5d0b3 100644
--- a/Source/portable/Rowley/MSP430F449/portext.asm
+++ b/Source/portable/Rowley/MSP430F449/portext.asm
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Rowley/MSP430F449/portmacro.h b/Source/portable/Rowley/MSP430F449/portmacro.h
index be48b566ae..5097e043f6 100644
--- a/Source/portable/Rowley/MSP430F449/portmacro.h
+++ b/Source/portable/Rowley/MSP430F449/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/SDCC/Cygnal/port.c b/Source/portable/SDCC/Cygnal/port.c
index f6ffd84332..d8cc36ad5d 100644
--- a/Source/portable/SDCC/Cygnal/port.c
+++ b/Source/portable/SDCC/Cygnal/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/SDCC/Cygnal/portmacro.h b/Source/portable/SDCC/Cygnal/portmacro.h
index 751e92e7ed..314a9371c0 100644
--- a/Source/portable/SDCC/Cygnal/portmacro.h
+++ b/Source/portable/SDCC/Cygnal/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Softune/MB91460/port.c b/Source/portable/Softune/MB91460/port.c
index 88fef31589..b53d9aa802 100644
--- a/Source/portable/Softune/MB91460/port.c
+++ b/Source/portable/Softune/MB91460/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Softune/MB91460/portmacro.h b/Source/portable/Softune/MB91460/portmacro.h
index cfd6c9b631..a032145457 100644
--- a/Source/portable/Softune/MB91460/portmacro.h
+++ b/Source/portable/Softune/MB91460/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Softune/MB96340/port.c b/Source/portable/Softune/MB96340/port.c
index 0698beb09e..b67a477a88 100644
--- a/Source/portable/Softune/MB96340/port.c
+++ b/Source/portable/Softune/MB96340/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/Softune/MB96340/portmacro.h b/Source/portable/Softune/MB96340/portmacro.h
index d0a01b4551..b31a5d6443 100644
--- a/Source/portable/Softune/MB96340/portmacro.h
+++ b/Source/portable/Softune/MB96340/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/WizC/PIC18/Drivers/Tick/Tick.c b/Source/portable/WizC/PIC18/Drivers/Tick/Tick.c
index 49fedbb830..a81e95a3c8 100644
--- a/Source/portable/WizC/PIC18/Drivers/Tick/Tick.c
+++ b/Source/portable/WizC/PIC18/Drivers/Tick/Tick.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/WizC/PIC18/Drivers/Tick/isrTick.c b/Source/portable/WizC/PIC18/Drivers/Tick/isrTick.c
index 6fd292120b..881634fa54 100644
--- a/Source/portable/WizC/PIC18/Drivers/Tick/isrTick.c
+++ b/Source/portable/WizC/PIC18/Drivers/Tick/isrTick.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/WizC/PIC18/addFreeRTOS.h b/Source/portable/WizC/PIC18/addFreeRTOS.h
index f5c63820cc..7bb0597705 100644
--- a/Source/portable/WizC/PIC18/addFreeRTOS.h
+++ b/Source/portable/WizC/PIC18/addFreeRTOS.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/WizC/PIC18/port.c b/Source/portable/WizC/PIC18/port.c
index 5d1817387b..36bfc56f1c 100644
--- a/Source/portable/WizC/PIC18/port.c
+++ b/Source/portable/WizC/PIC18/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/WizC/PIC18/portmacro.h b/Source/portable/WizC/PIC18/portmacro.h
index 80dad58f9a..b857b5c51e 100644
--- a/Source/portable/WizC/PIC18/portmacro.h
+++ b/Source/portable/WizC/PIC18/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/Flsh186/port.c b/Source/portable/oWatcom/16BitDOS/Flsh186/port.c
index 0f1b58b63d..93afbe20c1 100644
--- a/Source/portable/oWatcom/16BitDOS/Flsh186/port.c
+++ b/Source/portable/oWatcom/16BitDOS/Flsh186/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h b/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
index 4375a04523..2692f4a27f 100644
--- a/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
+++ b/Source/portable/oWatcom/16BitDOS/Flsh186/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/PC/port.c b/Source/portable/oWatcom/16BitDOS/PC/port.c
index a05df1a100..3b320eb2af 100644
--- a/Source/portable/oWatcom/16BitDOS/PC/port.c
+++ b/Source/portable/oWatcom/16BitDOS/PC/port.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/PC/portmacro.h b/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
index f39e921ab2..6b06121756 100644
--- a/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
+++ b/Source/portable/oWatcom/16BitDOS/PC/portmacro.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/common/portasm.h b/Source/portable/oWatcom/16BitDOS/common/portasm.h
index edc340d671..83a4f05be7 100644
--- a/Source/portable/oWatcom/16BitDOS/common/portasm.h
+++ b/Source/portable/oWatcom/16BitDOS/common/portasm.h
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/portable/oWatcom/16BitDOS/common/portcomn.c b/Source/portable/oWatcom/16BitDOS/common/portcomn.c
index 442e8ebad6..b78d921595 100644
--- a/Source/portable/oWatcom/16BitDOS/common/portcomn.c
+++ b/Source/portable/oWatcom/16BitDOS/common/portcomn.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/queue.c b/Source/queue.c
index ae1eeb97a3..7258f7a3e4 100644
--- a/Source/queue.c
+++ b/Source/queue.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *
diff --git a/Source/tasks.c b/Source/tasks.c
index d1e70174a2..bdc1088f92 100644
--- a/Source/tasks.c
+++ b/Source/tasks.c
@@ -1,5 +1,5 @@
 /*
-    FreeRTOS V6.0.3 - Copyright (C) 2010 Real Time Engineers Ltd.
+    FreeRTOS V6.0.4 - Copyright (C) 2010 Real Time Engineers Ltd.
 
     ***************************************************************************
     *                                                                         *