diff --git a/demos/AVR-AT90CANx-GCC/chconf.h b/demos/AVR-AT90CANx-GCC/chconf.h
index d3f4491b2..f0f3caf26 100644
--- a/demos/AVR-AT90CANx-GCC/chconf.h
+++ b/demos/AVR-AT90CANx-GCC/chconf.h
@@ -111,7 +111,7 @@
 /** Configuration option: If enabled then the threads have an option to serve
  *  messages by priority instead of FIFO order.
  * @note requires \p CH_USE_MESSAGES.*/
-#define CH_USE_MESSAGES_PRIORITY
+//#define CH_USE_MESSAGES_PRIORITY
 
 /** Configuration option: if specified then the
  *  \p chThdGetExitEventSource() function is included in the kernel.
diff --git a/demos/Win32-MSVS/chconf.h b/demos/Win32-MSVS/chconf.h
index e4710e575..b6d8e4c98 100644
--- a/demos/Win32-MSVS/chconf.h
+++ b/demos/Win32-MSVS/chconf.h
@@ -115,7 +115,7 @@
 /** Configuration option: If enabled then the threads have an option to serve
  *  messages by priority instead of FIFO order.
  * @note requires \p CH_USE_MESSAGES.*/
-#define CH_USE_MESSAGES_PRIORITY
+//#define CH_USE_MESSAGES_PRIORITY
 
 /** Configuration option: if specified then the
  *  \p chThdGetExitEventSource() function is included in the kernel.
diff --git a/demos/Win32-MinGW/chconf.h b/demos/Win32-MinGW/chconf.h
index 115db4325..b913a6cc4 100644
--- a/demos/Win32-MinGW/chconf.h
+++ b/demos/Win32-MinGW/chconf.h
@@ -115,7 +115,7 @@
 /** Configuration option: If enabled then the threads have an option to serve
  *  messages by priority instead of FIFO order.
  * @note requires \p CH_USE_MESSAGES.*/
-#define CH_USE_MESSAGES_PRIORITY
+//#define CH_USE_MESSAGES_PRIORITY
 
 /** Configuration option: if specified then the
  *  \p chThdGetExitEventSource() function is included in the kernel.
diff --git a/readme.txt b/readme.txt
index 47e4c16e7..03a6035c8 100644
--- a/readme.txt
+++ b/readme.txt
@@ -45,12 +45,12 @@ AVR-AT90CANx-GCC       - Port on AVR AT90CAN128, not complete yet.
   This change allows the implementation of a priority ceiling protocol into
   message servers threads. Threads serving messages by priority and threads
   serving messages in FIFO orded can exist at the same time in the system.
-  This feature can be enabled or disabled by removing the option
-  CH_USE_MESSAGES_PRIORITY into the chconf.h file.
+  This feature can be enabled or disabled by toggling the option
+  CH_USE_MESSAGES_PRIORITY into the chconf.h file (disabled by default, old
+  behavior).
   Note: This option brings a small overhead when sending a message regardless
   if in FIFO or priority order, if you dont need priority ordering for your
-  messages it is better disable the feature in chconf.h. It also saves some
-  space.
+  messages it is better to keep disabled the feature in chconf.h.
 - Added to the ARM demos load scripts the capability to load code in RAM
   instead flash, the function must be marked as:
     __attribute__((section(".ramtext")))