diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp
index ee3c8c26f..e9f0ab15a 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/iar/ch.ewp
@@ -2147,10 +2147,10 @@
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv1\pal_lld.h</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.h</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1\serial_lld.c</name>
diff --git a/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj b/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj
index fbb580b8a..fd5d61d30 100644
--- a/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj
+++ b/demos/ARMCM3-STM32F100-DISCOVERY/keil/ch.uvproj
@@ -899,7 +899,7 @@
             <File>
               <FileName>pwm_lld.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.c</FilePath>
+              <FilePath>..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</FilePath>
             </File>
             <File>
               <FileName>serial_lld.c</FileName>
@@ -944,7 +944,7 @@
             <File>
               <FileName>pwm_lld.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.h</FilePath>
+              <FilePath>..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.h</FilePath>
             </File>
             <File>
               <FileName>serial_lld.h</FileName>
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp
index f97a68345..9227464b9 100644
--- a/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/iar/ch.ewp
@@ -2138,10 +2138,10 @@
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2\pal_lld.h</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.h</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1\serial_lld.c</name>
diff --git a/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj b/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj
index 7f2ef1bf9..7752c318f 100644
--- a/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj
+++ b/demos/ARMCM3-STM32L152-DISCOVERY/keil/ch.uvproj
@@ -789,7 +789,7 @@
             <File>
               <FileName>pwm_lld.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.c</FilePath>
+              <FilePath>..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</FilePath>
             </File>
             <File>
               <FileName>serial_lld.c</FileName>
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp
index 55e090426..f638ba4d4 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp
+++ b/demos/ARMCM4-STM32F407-DISCOVERY/iar/ch.ewp
@@ -2135,10 +2135,10 @@
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\GPIOv2\pal_lld.h</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.c</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</name>
       </file>
       <file>
-        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\pwm_lld.h</name>
+        <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.h</name>
       </file>
       <file>
         <name>$PROJ_DIR$\..\..\..\os\hal\platforms\STM32\USARTv1\serial_lld.c</name>
diff --git a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj
index ef926a349..6974a806e 100644
--- a/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj
+++ b/demos/ARMCM4-STM32F407-DISCOVERY/keil/ch.uvproj
@@ -774,12 +774,12 @@
             <File>
               <FileName>pwm_lld.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.c</FilePath>
+              <FilePath>..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.c</FilePath>
             </File>
             <File>
               <FileName>pwm_lld.h</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\..\os\hal\platforms\STM32\pwm_lld.h</FilePath>
+              <FilePath>..\..\..\os\hal\platforms\STM32\TIMv1\pwm_lld.h</FilePath>
             </File>
             <File>
               <FileName>serial_lld.c</FileName>
diff --git a/os/hal/platforms/STM32F1xx/platform_f105_f107.mk b/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
index 5778a63eb..88595f8ad 100644
--- a/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
+++ b/os/hal/platforms/STM32F1xx/platform_f105_f107.mk
@@ -5,15 +5,15 @@ PLATFORMSRC = ${CHIBIOS}/os/hal/platforms/STM32F1xx/stm32_dma.c \
               ${CHIBIOS}/os/hal/platforms/STM32F1xx/ext_lld_isr.c \
               ${CHIBIOS}/os/hal/platforms/STM32/can_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/ext_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/gpt_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/icu_lld.c \
 			  ${CHIBIOS}/os/hal/platforms/STM32/mac_lld.c \
-              ${CHIBIOS}/os/hal/platforms/STM32/pwm_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/sdc_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/GPIOv1/pal_lld.c \
 			  ${CHIBIOS}/os/hal/platforms/STM32/I2Cv1/i2c_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/RTCv1/rtc_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/SPIv1/spi_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/gpt_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/icu_lld.c \
+              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1/pwm_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/USARTv1/serial_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/USARTv1/uart_lld.c \
               ${CHIBIOS}/os/hal/platforms/STM32/OTGv1/usb_lld.c
@@ -25,5 +25,6 @@ PLATFORMINC = ${CHIBIOS}/os/hal/platforms/STM32F1xx \
               ${CHIBIOS}/os/hal/platforms/STM32/I2Cv1 \
               ${CHIBIOS}/os/hal/platforms/STM32/RTCv1 \
               ${CHIBIOS}/os/hal/platforms/STM32/SPIv1 \
+              ${CHIBIOS}/os/hal/platforms/STM32/TIMv1 \
               ${CHIBIOS}/os/hal/platforms/STM32/USARTv1 \
               ${CHIBIOS}/os/hal/platforms/STM32/OTGv1