diff --git a/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk b/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk
index e2fb225aa..b90777b1e 100644
--- a/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk
+++ b/os/hal/ports/AVR/XMEGA/ATXMEGAxxxA4U/platform.mk
@@ -10,7 +10,7 @@ include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/DACv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/DMAv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/GPIOv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/SPIv1/driver.mk
-include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/USARTv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/WDGv1/driver.mk
 
diff --git a/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/driver.mk b/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/driver.mk
new file mode 100644
index 000000000..fc82ac489
--- /dev/null
+++ b/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/driver.mk
@@ -0,0 +1,3 @@
+PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/hal_st_lld.c
+
+PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1
diff --git a/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_st_lld.c b/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/hal_st_lld.c
similarity index 100%
rename from os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_st_lld.c
rename to os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/hal_st_lld.c
diff --git a/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_st_lld.h b/os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/hal_st_lld.h
similarity index 100%
rename from os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_st_lld.h
rename to os/hal/ports/AVR/XMEGA/LLD/SYSTICKv1/hal_st_lld.h
diff --git a/os/hal/ports/AVR/XMEGA/LLD/TIMv1/driver.mk b/os/hal/ports/AVR/XMEGA/LLD/TIMv1/driver.mk
deleted file mode 100644
index 5e2fce138..000000000
--- a/os/hal/ports/AVR/XMEGA/LLD/TIMv1/driver.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_st_lld.c
-
-ifeq ($(USE_SMART_BUILD),yes)
-ifneq ($(findstring HAL_USE_GPT TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_gpt_lld.c
-endif
-ifneq ($(findstring HAL_USE_ICU TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_icu_lld.c
-endif
-ifneq ($(findstring HAL_USE_PWM TRUE,$(HALCONF)),)
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_pwm_lld.c
-endif
-else
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_gpt_lld.c
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_icu_lld.c
-PLATFORMSRC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1/hal_pwm_lld.c
-endif
-
-PLATFORMINC += $(CHIBIOS)/os/hal/ports/AVR/XMEGA/LLD/TIMv1