diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
index ef21d7136..f497dd143 100644
--- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
+++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h
@@ -425,7 +425,7 @@
 #define STM32_HAS_OTG1                      TRUE
 #define STM32_OTG1_ENDPOINTS                5
 #define STM32_HAS_OTG2                      TRUE
-#define STM32_OTG2_ENDPOINTS                8
+#define STM32_OTG2_ENDPOINTS                7
 
 #define STM32_HAS_USB                       FALSE
 
@@ -771,7 +771,7 @@
 #define STM32_HAS_OTG1                      TRUE
 #define STM32_OTG1_ENDPOINTS                6
 #define STM32_HAS_OTG2                      TRUE
-#define STM32_OTG2_ENDPOINTS                8
+#define STM32_OTG2_ENDPOINTS                7
 
 #define STM32_HAS_USB                       FALSE
 
diff --git a/readme.txt b/readme.txt
index e86105558..a1162999f 100644
--- a/readme.txt
+++ b/readme.txt
@@ -160,6 +160,7 @@
 - RT:  Merged RT4.
 - NIL: Merged NIL2.
 - NIL: Added STM32F7 demo.
+- HAL: Fixed STM32 OTGv1 number of endpoints (bug #833)(backported to 16.1.8).
 - HAL: Fixed transaction end problem with STM32 OTGv1 driver (bug #832)
        (backported to 16.1.8).
 - HAL: Removed unused file in STM32 TIM driver (bug #831).