diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
index 378175d7a..7f0d25903 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/halconf.h
@@ -170,7 +170,7 @@
  * @brief   Enables the TRNG subsystem.
  */
 #if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
-#define HAL_USE_TRNG                        TRUE
+#define HAL_USE_TRNG                        FALSE
 #endif
 
 /**
diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h
index 365aa8e87..424399596 100644
--- a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h
+++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h
@@ -358,7 +358,7 @@
 /*
  * TRNG driver system settings.
  */
-#define STM32_TRNG_USE_RNG1                 TRUE
+#define STM32_TRNG_USE_RNG1                 FALSE
 
 /*
  * UART driver system settings.
diff --git a/os/hal/ports/STM32/STM32G4xx/hal_lld.h b/os/hal/ports/STM32/STM32G4xx/hal_lld.h
index 9598214bc..0d89fc69b 100644
--- a/os/hal/ports/STM32/STM32G4xx/hal_lld.h
+++ b/os/hal/ports/STM32/STM32G4xx/hal_lld.h
@@ -1783,6 +1783,11 @@
  */
 #define STM32_TIMCLK2               STM32_TIMP2CLK
 
+/**
+ * @brief   RNG clock point.
+ */
+#define STM32_RNGCLK                STM32_48CLK
+
 /**
  * @brief   USB clock point.
  */
diff --git a/os/hal/ports/STM32/STM32G4xx/platform.mk b/os/hal/ports/STM32/STM32G4xx/platform.mk
index 9fb687fa6..942a1e53d 100644
--- a/os/hal/ports/STM32/STM32G4xx/platform.mk
+++ b/os/hal/ports/STM32/STM32G4xx/platform.mk
@@ -33,6 +33,7 @@ include $(CHIBIOS)/os/hal/ports/STM32/LLD/GPIOv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/I2Cv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/RTCv3/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/QUADSPIv1/driver.mk
+include $(CHIBIOS)/os/hal/ports/STM32/LLD/RNGv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/SPIv2/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/TIMv1/driver.mk
 include $(CHIBIOS)/os/hal/ports/STM32/LLD/USARTv2/driver.mk
diff --git a/readme.txt b/readme.txt
index 55722d193..6ee4d39bd 100644
--- a/readme.txt
+++ b/readme.txt
@@ -74,7 +74,7 @@
 *****************************************************************************
 
 *** Next ***
-- HAL: TRNG support added to STM32F7xx.
+- HAL: TRNG support added to STM32F7xx and STM32G4xx.
 - NEW: Added support for .cc files extensions in makefiles.
 - HAL: New RTCv3 driver for STM32G0xx and STM32G4xx.
 - HAL: Added support for DAC3 and DAC4 in STM32 DACv1 driver.