diff --git a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
index 16ed77eff..5268ee033 100644
--- a/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32L4xx/stm32_registry.h
@@ -429,7 +429,9 @@
 #define STM32_HAS_GPIOK                     FALSE
 #define STM32_GPIO_EN_MASK                  (RCC_AHB2ENR_GPIOAEN |          \
                                              RCC_AHB2ENR_GPIOBEN |          \
-                                             RCC_AHB2ENR_GPIOCEN)
+                                             RCC_AHB2ENR_GPIOCEN |          \
+                                             RCC_AHB2ENR_GPIODEN |          \
+                                             RCC_AHB2ENR_GPIOHEN)
 
 /* I2C attributes.*/
 #define STM32_HAS_I2C1                      TRUE
@@ -1511,7 +1513,8 @@
                                              RCC_AHB2ENR_GPIOEEN |          \
                                              RCC_AHB2ENR_GPIOFEN |          \
                                              RCC_AHB2ENR_GPIOGEN |          \
-                                             RCC_AHB2ENR_GPIOHEN)
+                                             RCC_AHB2ENR_GPIOHEN |          \
+                                             RCC_AHB2ENR_GPIOIEN)
 
 /* I2C attributes.*/
 #define STM32_HAS_I2C1                      TRUE
diff --git a/readme.txt b/readme.txt
index 6b85b5654..1456f5571 100644
--- a/readme.txt
+++ b/readme.txt
@@ -124,6 +124,8 @@
 - NEW: Increased stacks size in RT test suite from 128 to 192. added an
        option to override the stack size by defining THREADS_STACK_SIZE
        in the makefile.
+- FIX: Fixed missing clock enables for some GPIOS on some STM32L4s (bug #1237)
+       (backported to 20.3.5)(backported to 21.11.3).
 - FIX: Fixed old bugs in serial driver header (bug #1236)
        (backported to 20.3.5)(backported to 21.11.3).
 - FIX: Fixed virtual timers lockup uder rare conditions (bug #1235)