diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
index 71aa3ffec..b34f9edf1 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/ST_STM32VL_DISCOVERY/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 
diff --git a/demos/ARMCM3-STM32F103-FATFS/Makefile b/demos/ARMCM3-STM32F103-FATFS/Makefile
index 55311691a..0d31e021a 100644
--- a/demos/ARMCM3-STM32F103-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F103-FATFS/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 include $(CHIBIOS)/ext/fatfs/fatfs.mk
diff --git a/demos/ARMCM3-STM32F103-G++/Makefile b/demos/ARMCM3-STM32F103-G++/Makefile
index 9cf499290..e88957c87 100644
--- a/demos/ARMCM3-STM32F103-G++/Makefile
+++ b/demos/ARMCM3-STM32F103-G++/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 
diff --git a/demos/ARMCM3-STM32F103/Makefile b/demos/ARMCM3-STM32F103/Makefile
index 45101dc87..4d4ba0246 100644
--- a/demos/ARMCM3-STM32F103/Makefile
+++ b/demos/ARMCM3-STM32F103/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 
diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/Makefile b/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
index 7ecf4e3cb..2485c272c 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/ST_STM3210E_EVAL/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 include $(CHIBIOS)/ext/fatfs/fatfs.mk
diff --git a/demos/ARMCM3-STM32F107/Makefile b/demos/ARMCM3-STM32F107/Makefile
index 4f70f1e0e..90607b250 100644
--- a/demos/ARMCM3-STM32F107/Makefile
+++ b/demos/ARMCM3-STM32F107/Makefile
@@ -57,7 +57,7 @@ CHIBIOS = ../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P107/board.mk
 include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 
diff --git a/docs/Doxyfile_chm b/docs/Doxyfile_chm
index f6580b758..085a4d06a 100644
--- a/docs/Doxyfile_chm
+++ b/docs/Doxyfile_chm
@@ -647,10 +647,11 @@ INPUT                  = ../docs/src \
                          ../os/kernel/templates \
                          ../os/ports \
                          ../os/ports/GCC/ARM \
-                         ../os/ports/GCC/ARM\LPC214x \
-                         ../os/ports/GCC/ARM\AT91SAM7 \
+                         ../os/ports/GCC/ARM/LPC214x \
+                         ../os/ports/GCC/ARM/AT91SAM7 \
                          ../os/ports/GCC/ARMCMx \
-                         ../os/ports/GCC/ARMCMx/STM32 \
+                         ../os/ports/GCC/ARMCMx/STM32F1xx \
+                         ../os/ports/GCC/ARMCMx/STM32L1xx \
                          ../os/ports/GCC/ARMCMx/LPC11xx \
                          ../os/ports/GCC/ARMCMx/LPC13xx \
                          ../os/ports/GCC/PPC \
@@ -679,7 +680,8 @@ INPUT                  = ../docs/src \
                          ../os/hal/platforms/LPC214x/platform.dox \
                          ../os/hal/platforms/MSP430/platform.dox \
                          ../os/hal/platforms/SPC56x/platform.dox \
-                         ../os/hal/platforms/STM32/platform.dox \
+                         ../os/hal/platforms/STM32F1xx/platform.dox \
+                         ../os/hal/platforms/STM32L1xx/platform.dox \
                          ../os/hal/platforms/STM8L/platform.dox \
                          ../os/hal/platforms/STM8S/platform.dox \
                          ../os/various \
@@ -742,7 +744,8 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../os/hal/platforms/STM32/stm32f10x.h \
+EXCLUDE                = ../os/hal/platforms/STM32F1xx/stm32f10x.h \
+                         ../os/hal/platforms/STM32L1xx/stm32l10x.h \
                          ../os/hal/platforms/STM8/stm8s.h \
                          ../os/hal/platforms/STM8/stm8s_type.h \
                          ../os/hal/platforms/LPC11xx/LPC11xx.h \
diff --git a/docs/Doxyfile_html b/docs/Doxyfile_html
index 0d2e6e31b..7e85cd9ed 100644
--- a/docs/Doxyfile_html
+++ b/docs/Doxyfile_html
@@ -647,10 +647,11 @@ INPUT                  = ../docs/src \
                          ../os/kernel/templates \
                          ../os/ports \
                          ../os/ports/GCC/ARM \
-                         ../os/ports/GCC/ARM\LPC214x \
-                         ../os/ports/GCC/ARM\AT91SAM7 \
+                         ../os/ports/GCC/ARM/LPC214x \
+                         ../os/ports/GCC/ARM/AT91SAM7 \
                          ../os/ports/GCC/ARMCMx \
-                         ../os/ports/GCC/ARMCMx/STM32 \
+                         ../os/ports/GCC/ARMCMx/STM32F1xx \
+                         ../os/ports/GCC/ARMCMx/STM32L1xx \
                          ../os/ports/GCC/ARMCMx/LPC11xx \
                          ../os/ports/GCC/ARMCMx/LPC13xx \
                          ../os/ports/GCC/PPC \
@@ -679,7 +680,8 @@ INPUT                  = ../docs/src \
                          ../os/hal/platforms/LPC214x/platform.dox \
                          ../os/hal/platforms/MSP430/platform.dox \
                          ../os/hal/platforms/SPC56x/platform.dox \
-                         ../os/hal/platforms/STM32/platform.dox \
+                         ../os/hal/platforms/STM32F1xx/platform.dox \
+                         ../os/hal/platforms/STM32L1xx/platform.dox \
                          ../os/hal/platforms/STM8L/platform.dox \
                          ../os/hal/platforms/STM8S/platform.dox \
                          ../os/various \
@@ -742,7 +744,8 @@ RECURSIVE              = NO
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = ../os/hal/platforms/STM32/stm32f10x.h \
+EXCLUDE                = ../os/hal/platforms/STM32F1xx/stm32f10x.h \
+                         ../os/hal/platforms/STM32L1xx/stm32l10x.h \
                          ../os/hal/platforms/STM8/stm8s.h \
                          ../os/hal/platforms/STM8/stm8s_type.h \
                          ../os/hal/platforms/LPC11xx/LPC11xx.h \
diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h b/os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h
index 5b630dbb8..02d07e73d 100644
--- a/os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h
+++ b/os/ports/GCC/ARMCMx/STM32F1xx/cmparams.h
@@ -19,13 +19,13 @@
 */
 
 /**
- * @file    GCC/ARMCMx/STM32/cmparams.h
- * @brief   ARM Cortex-M3 parameters for the STM32.
+ * @file    GCC/ARMCMx/STM32F1xx/cmparams.h
+ * @brief   ARM Cortex-M3 parameters for the STM32F1xx.
  *
- * @defgroup ARMCMx_STM32 STM32 Specific Parameters
+ * @defgroup ARMCMx_STM32F1xx STM32F1xx Specific Parameters
  * @ingroup ARMCMx_SPECIFIC
  * @details This file contains the Cortex-M3 specific parameters for the
- *          STM32 platform.
+ *          STM32F1xx platform.
  * @{
  */
 
diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/port.mk b/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
index 9646c1d6f..6e0e16902 100644
--- a/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
+++ b/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
@@ -1,6 +1,6 @@
 # List of the ChibiOS/RT Cortex-M3 STM32 port files.
 PORTSRC = $(CHIBIOS)/os/ports/GCC/ARMCMx/crt0.c \
-          $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/vectors.c \
+          $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/vectors.c \
           ${CHIBIOS}/os/ports/GCC/ARMCMx/chcore.c \
           ${CHIBIOS}/os/ports/GCC/ARMCMx/chcore_v7m.c \
           ${CHIBIOS}/os/ports/GCC/ARMCMx/nvic.c
@@ -8,6 +8,6 @@ PORTSRC = $(CHIBIOS)/os/ports/GCC/ARMCMx/crt0.c \
 PORTASM =
 
 PORTINC = ${CHIBIOS}/os/ports/GCC/ARMCMx \
-          ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32
+          ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32F1xx
 
-PORTLD  = ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32/ld
+PORTLD  = ${CHIBIOS}/os/ports/GCC/ARMCMx/STM32F1xx/ld
diff --git a/os/ports/GCC/ARMCMx/STM32F1xx/vectors.c b/os/ports/GCC/ARMCMx/STM32F1xx/vectors.c
index e4d1bcb28..d47eeb72e 100644
--- a/os/ports/GCC/ARMCMx/STM32F1xx/vectors.c
+++ b/os/ports/GCC/ARMCMx/STM32F1xx/vectors.c
@@ -19,12 +19,12 @@
 */
 
 /**
- * @file    GCC/ARMCMx/STM32/vectors.c
- * @brief   Interrupt vectors for the STM32 family.
+ * @file    GCC/ARMCMx/STM32F1xx/vectors.c
+ * @brief   Interrupt vectors for the STM32F1xx family.
  *
- * @defgroup ARMCMx_STM32_VECTORS STM32 Interrupt Vectors
+ * @defgroup ARMCMx_STM32F1xx_VECTORS STM32F1xx Interrupt Vectors
  * @ingroup ARMCMx_SPECIFIC
- * @details Interrupt vectors for the STM32 family.
+ * @details Interrupt vectors for the STM32F1xx family.
  * @{
  */
 
diff --git a/testhal/STM32F1xx/ADC/Makefile b/testhal/STM32F1xx/ADC/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/ADC/Makefile
+++ b/testhal/STM32F1xx/ADC/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/CAN/Makefile b/testhal/STM32F1xx/CAN/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/CAN/Makefile
+++ b/testhal/STM32F1xx/CAN/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/GPT/Makefile b/testhal/STM32F1xx/GPT/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/GPT/Makefile
+++ b/testhal/STM32F1xx/GPT/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/IRQ_STORM/Makefile b/testhal/STM32F1xx/IRQ_STORM/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/IRQ_STORM/Makefile
+++ b/testhal/STM32F1xx/IRQ_STORM/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/PWM-ICU/Makefile b/testhal/STM32F1xx/PWM-ICU/Makefile
index 507d994f5..93cf17eff 100644
--- a/testhal/STM32F1xx/PWM-ICU/Makefile
+++ b/testhal/STM32F1xx/PWM-ICU/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/SDIO/Makefile b/testhal/STM32F1xx/SDIO/Makefile
index af2aa97d8..c56c5eadb 100644
--- a/testhal/STM32F1xx/SDIO/Makefile
+++ b/testhal/STM32F1xx/SDIO/Makefile
@@ -58,9 +58,9 @@ LDSCRIPT= ch.ld
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/ST_STM3210E_EVAL/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/SPI/Makefile b/testhal/STM32F1xx/SPI/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/SPI/Makefile
+++ b/testhal/STM32F1xx/SPI/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/UART/Makefile b/testhal/STM32F1xx/UART/Makefile
index 1312b4480..f93aeb073 100644
--- a/testhal/STM32F1xx/UART/Makefile
+++ b/testhal/STM32F1xx/UART/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 #include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/USB_CDC/Makefile b/testhal/STM32F1xx/USB_CDC/Makefile
index 92a70f199..45218c328 100644
--- a/testhal/STM32F1xx/USB_CDC/Makefile
+++ b/testhal/STM32F1xx/USB_CDC/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk
 
diff --git a/testhal/STM32F1xx/USB_MSC/Makefile b/testhal/STM32F1xx/USB_MSC/Makefile
index 81feb6170..651b7b346 100644
--- a/testhal/STM32F1xx/USB_MSC/Makefile
+++ b/testhal/STM32F1xx/USB_MSC/Makefile
@@ -55,9 +55,9 @@ PROJECT = ch
 # Imported source files and paths
 CHIBIOS = ../../..
 include $(CHIBIOS)/boards/OLIMEX_STM32_P103/board.mk
-include $(CHIBIOS)/os/hal/platforms/STM32/platform.mk
+include $(CHIBIOS)/os/hal/platforms/STM32F1xx/platform.mk
 include $(CHIBIOS)/os/hal/hal.mk
-include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32/port.mk
+include $(CHIBIOS)/os/ports/GCC/ARMCMx/STM32F1xx/port.mk
 include $(CHIBIOS)/os/kernel/kernel.mk
 include $(CHIBIOS)/test/test.mk