diff --git a/demos/AVR-AT90CANx-GCC/board.c b/boards/OLIMEX_AVR_CAN/board.c
similarity index 100%
rename from demos/AVR-AT90CANx-GCC/board.c
rename to boards/OLIMEX_AVR_CAN/board.c
diff --git a/demos/AVR-AT90CANx-GCC/board.h b/boards/OLIMEX_AVR_CAN/board.h
similarity index 92%
rename from demos/AVR-AT90CANx-GCC/board.h
rename to boards/OLIMEX_AVR_CAN/board.h
index 0abe920eb..f0038ba0e 100644
--- a/demos/AVR-AT90CANx-GCC/board.h
+++ b/boards/OLIMEX_AVR_CAN/board.h
@@ -20,6 +20,13 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+/*
+ * Setup for the Olimex LCP-P2148 proto board.
+ */
+
+/*
+ * Board identifier.
+ */
 #define BOARD_OLIMEX_AVR_CAN
 
 /*
diff --git a/boards/OLIMEX_AVR_CAN/board.mk b/boards/OLIMEX_AVR_CAN/board.mk
new file mode 100644
index 000000000..4d2d406ad
--- /dev/null
+++ b/boards/OLIMEX_AVR_CAN/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_AVR_CAN/board.c
+
+# Required include directories
+BOARDINC = ${CHIBIOS}/boards/OLIMEX_AVR_CAN
diff --git a/demos/AVR-ATmega128-GCC/board.c b/boards/OLIMEX_AVR_MT_128/board.c
similarity index 100%
rename from demos/AVR-ATmega128-GCC/board.c
rename to boards/OLIMEX_AVR_MT_128/board.c
diff --git a/demos/AVR-ATmega128-GCC/board.h b/boards/OLIMEX_AVR_MT_128/board.h
similarity index 94%
rename from demos/AVR-ATmega128-GCC/board.h
rename to boards/OLIMEX_AVR_MT_128/board.h
index 97da17097..0354cce4f 100644
--- a/demos/AVR-ATmega128-GCC/board.h
+++ b/boards/OLIMEX_AVR_MT_128/board.h
@@ -20,6 +20,13 @@
 #ifndef _BOARD_H_
 #define _BOARD_H_
 
+/*
+ * Setup for the Olimex LCP-P2148 proto board.
+ */
+
+/*
+ * Board identifier.
+ */
 #define BOARD_OLIMEX_AVR_MT_128
 
 /*       PA7 RLY  DS  B5  B4  B3  B2  B1
diff --git a/boards/OLIMEX_AVR_MT_128/board.mk b/boards/OLIMEX_AVR_MT_128/board.mk
new file mode 100644
index 000000000..7b903ffec
--- /dev/null
+++ b/boards/OLIMEX_AVR_MT_128/board.mk
@@ -0,0 +1,5 @@
+# List of all the board related files.
+BOARDSRC = ${CHIBIOS}/boards/OLIMEX_AVR_MT_128/board.c
+
+# Required include directories
+BOARDINC = ${CHIBIOS}/boards/OLIMEX_AVR_MT_128
diff --git a/demos/AVR-AT90CANx-GCC/Makefile b/demos/AVR-AT90CANx-GCC/Makefile
index 0b6943cab..11e902b59 100644
--- a/demos/AVR-AT90CANx-GCC/Makefile
+++ b/demos/AVR-AT90CANx-GCC/Makefile
@@ -81,21 +81,23 @@ OBJDIR = .
 
 # Imported source files
 CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/AVR/platform.mk
-include ${CHIBIOS}/os/ports/GCC/AVR/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_AVR_CAN/board.mk
+include $(CHIBIOS)/os/hal/platforms/AVR/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/AVR/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC = ${PORTSRC} \
-      ${KERNSRC} \
-      ${TESTSRC} \
-      ${HALSRC} \
-      ${PLATFORMSRC} \
-      ${CHIBIOS}/os/various/evtimer.c \
-      board.c main.c
+SRC = $(PORTSRC) \
+      $(KERNSRC) \
+      $(TESTSRC) \
+      $(HALSRC) \
+      $(PLATFORMSRC) \
+      $(BOARDSRC) \
+      $(CHIBIOS)/os/various/evtimer.c \
+      main.c
 
 
 # List C++ source files here. (C dependencies are automatically generated.)
@@ -129,8 +131,9 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
-               ${CHIBIOS}/os/various
+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
+               $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+               $(CHIBIOS)/os/various
 
 
 # Compiler flag to set the C Standard level.
diff --git a/demos/AVR-ATmega128-GCC/Makefile b/demos/AVR-ATmega128-GCC/Makefile
index 1ae0a672a..3f42dce8e 100644
--- a/demos/AVR-ATmega128-GCC/Makefile
+++ b/demos/AVR-ATmega128-GCC/Makefile
@@ -81,21 +81,23 @@ OBJDIR = .
 
 # Imported source files
 CHIBIOS = ../..
-include ${CHIBIOS}/os/hal/hal.mk
-include ${CHIBIOS}/os/hal/platforms/AVR/platform.mk
-include ${CHIBIOS}/os/ports/GCC/AVR/port.mk
-include ${CHIBIOS}/os/kernel/kernel.mk
-include ${CHIBIOS}/test/test.mk
+include $(CHIBIOS)/boards/OLIMEX_AVR_MT_128/board.mk
+include $(CHIBIOS)/os/hal/platforms/AVR/platform.mk
+include $(CHIBIOS)/os/hal/hal.mk
+include $(CHIBIOS)/os/ports/GCC/AVR/port.mk
+include $(CHIBIOS)/os/kernel/kernel.mk
+include $(CHIBIOS)/test/test.mk
 
 
 # List C source files here. (C dependencies are automatically generated.)
-SRC = ${PORTSRC} \
-      ${KERNSRC} \
-      ${TESTSRC} \
-      ${HALSRC} \
-      ${PLATFORMSRC} \
-      ${CHIBIOS}/os/various/evtimer.c \
-      lcd.c board.c main.c
+SRC = $(PORTSRC) \
+      $(KERNSRC) \
+      $(TESTSRC) \
+      $(HALSRC) \
+      $(PLATFORMSRC) \
+      $(BOARDSRC) \
+      $(CHIBIOS)/os/various/evtimer.c \
+      lcd.c main.c
 
 
 # List C++ source files here. (C dependencies are automatically generated.)
@@ -129,8 +131,9 @@ DEBUG = dwarf-2
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) $(HALINC) $(PLATFORMINC) \
-               ${CHIBIOS}/os/various
+EXTRAINCDIRS = $(PORTINC) $(KERNINC) $(TESTINC) \
+               $(HALINC) $(PLATFORMINC) $(BOARDINC) \
+               $(CHIBIOS)/os/various
 
 
 # Compiler flag to set the C Standard level.
diff --git a/readme.txt b/readme.txt
index eeb54dde2..b41c7fc63 100644
--- a/readme.txt
+++ b/readme.txt
@@ -9,9 +9,11 @@
 - NEW: Added custom mode settings to the STM32 PAL driver:
   - PAL_MODE_STM32_ALTERNATE_PUSHPULL
   - PAL_MODE_STM32_ALTERNATE_OPENDRAIN
+- NEW: Included all the board-specific files into a new directories structure
+  under ./boards, this allows to not duplicate the board files into each demo.
 - CHANGE: Changes to the PWM driver model, made it simpler.
 - CHANGE: The STM32 device drivers now no more configure the I/O pins on
-  initialization. Pins mush be configured in board.h, the change was required
+  initialization. Pins must be configured in board.h, the change was required
   in order to support the STM32 AFIO remapping feature.
 
 *** 1.3.5 ***