diff --git a/demos/ARMCM3-STM32F103/chconf.h b/demos/ARMCM3-STM32F103/chconf.h
index c9c4c286a..afd605633 100644
--- a/demos/ARMCM3-STM32F103/chconf.h
+++ b/demos/ARMCM3-STM32F103/chconf.h
@@ -358,7 +358,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_CHECKS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_CHECKS            FALSE
+#define CH_DBG_ENABLE_CHECKS            TRUE
 #endif
 
 /**
@@ -370,7 +370,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_ASSERTS) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_ASSERTS           FALSE
+#define CH_DBG_ENABLE_ASSERTS           TRUE
 #endif
 
 /**
@@ -381,7 +381,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_ENABLE_TRACE) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_TRACE             FALSE
+#define CH_DBG_ENABLE_TRACE             TRUE
 #endif
 
 /**
@@ -395,7 +395,7 @@
  *          @p panic_msg variable set to @p NULL.
  */
 #if !defined(CH_DBG_ENABLE_STACK_CHECK) || defined(__DOXYGEN__)
-#define CH_DBG_ENABLE_STACK_CHECK       FALSE
+#define CH_DBG_ENABLE_STACK_CHECK       TRUE
 #endif
 
 /**
@@ -407,7 +407,7 @@
  * @note    The default is @p FALSE.
  */
 #if !defined(CH_DBG_FILL_THREADS) || defined(__DOXYGEN__)
-#define CH_DBG_FILL_THREADS             FALSE
+#define CH_DBG_FILL_THREADS             TRUE
 #endif
 
 /**
diff --git a/readme.txt b/readme.txt
index 821716715..a9ffa18a7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,7 @@
   (backported to 2.2.4).
 - FIX: Fixed timeout problem in the lwIP interface layer (bug 3302420)
   (backported to 2.2.4).
+- NEW: Added Eclipse ChibiOS/RT debugger plugin 1.0.4 under ./tools/eclipse.
 - NEW: The ARMCMx startup file (crt0.c) now is able to fill the stack areas
   with a filler (default behavior). This is required in order to easily assess
   the stack usage at runtime.
diff --git a/tools/eclipse/plugins/org.chibios.tools.eclipse.debug_1.0.4.jar b/tools/eclipse/plugins/org.chibios.tools.eclipse.debug_1.0.4.jar
new file mode 100644
index 000000000..7a72647d3
Binary files /dev/null and b/tools/eclipse/plugins/org.chibios.tools.eclipse.debug_1.0.4.jar differ
diff --git a/tools/eclipse/readme.txt b/tools/eclipse/readme.txt
new file mode 100644
index 000000000..07e387f9e
--- /dev/null
+++ b/tools/eclipse/readme.txt
@@ -0,0 +1,16 @@
+This folder contains ChibiOS/RT related Eclipse extensions:
+
+- org.chibios.tools.eclipse.debug_x.y.z.jar, debugger extension that allows to
+  inspect the ChibiOS/RT internal data structures at debug time. This plugin
+  is best used when the kernel debug options are turned on.
+  Installation:
+  - Copy the plugin under [eclipse]/plugins.
+  - Start Eclipse and enable the plugin from:
+      Window->Show View->Others...->ChibiOS/RT
+  - Make sure that Eclipse is using the "Standard Debugger" from:
+      Window->Preferences->Run/Debug->Launching->Default Launchers->
+      GDB Hardware Debugging->[Debug]
+  - Start a debug session of a ChibiOS/RT demo or application and step until
+    after chSysInit() has been invoked.
+  - Inspect the various structures (Timers, Threads etc) using the ChibiOS/RT
+    view by pressing the yellow refresh button.