diff --git a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.h b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.h
index 8f158fedc..81d8c094e 100644
--- a/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.h
+++ b/os/hal/ports/STM32/LLD/TIMv1/stm32_tim.h
@@ -515,11 +515,25 @@ typedef struct {
   volatile uint32_t     RCR;
   volatile uint32_t     CCR[4];
   volatile uint32_t     BDTR;
+#if defined(STM32G4)
+  volatile uint32_t     CCXR[2];
+  volatile uint32_t     CCMR3;
+  volatile uint32_t     DTR2;
+  volatile uint32_t     ECR;
+  volatile uint32_t     TISEL;
+  volatile uint32_t     AF1;
+  volatile uint32_t     AF2;
+  volatile uint32_t     OR;
+  volatile uint32_t     RESERVED0[220];
+  volatile uint32_t     DCR;
+  volatile uint32_t     DMAR;
+#else
   volatile uint32_t     DCR;
   volatile uint32_t     DMAR;
   volatile uint32_t     OR;
   volatile uint32_t     CCMR3;
   volatile uint32_t     CCXR[2];
+#endif
 } stm32_tim_t;
 
 /**
diff --git a/readme.txt b/readme.txt
index bbd23dde2..d6dddf517 100644
--- a/readme.txt
+++ b/readme.txt
@@ -128,11 +128,13 @@
        MEMS Accelerometers.
 - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1).
 - NEW: Added latency measurement test application.
+- FIX: Fixed TIM register layout difference for STM32G4 series (bug #1148)
+       (backported to 20.3.4).
 - FIX: Fixed STM32 QUADSPI driver problem when used with DMAv2 (bug #1147)
-       (backported to 20.3.4)
+       (backported to 20.3.4).
 - FIX: Fixed incorrect IRQ vector for PVM (bug #1146)
-       (backported to 20.3.4)
-- FIX: Fixed missing STM32F765 from registry (bug #1145)
+       (backported to 20.3.4).
+- FIX: Fixed missing STM32F765 from registry (bug #1145).
        (backported to 20.3.3)(backported to 19.1.5).
 - FIX: Fixed wrong macro check on STM32 SPIv3 (bug #1144)
        (backported to 20.3.3)(backported to 19.1.5).