diff --git a/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti16-35_38.inc b/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti16-35_38.inc
index aa2123544..11fa96ff1 100644
--- a/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti16-35_38.inc
+++ b/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti16-35_38.inc
@@ -80,7 +80,7 @@ static inline void exti16_exti35_38_irq_deinit(void) {
  *
  * @isr
  */
-OSAL_IRQ_HANDLER(STM32_EXTI163538_HANDLER) {
+OSAL_IRQ_HANDLER(STM32_EXTI1635_38_HANDLER) {
   uint32_t pr;
 
   OSAL_IRQ_PROLOGUE();
@@ -108,10 +108,10 @@ OSAL_IRQ_HANDLER(STM32_EXTI163538_HANDLER) {
   STM32_EXTI35_ISR(pr, 35);
 #endif
 #if defined(STM32_EXTI36_ISR)
-  STM32_EXTI35_ISR(pr, 36);
+  STM32_EXTI36_ISR(pr, 36);
 #endif
 #if defined(STM32_EXTI37_ISR)
-  STM32_EXTI35_ISR(pr, 37);
+  STM32_EXTI37_ISR(pr, 37);
 #endif
 #if defined(STM32_EXTI38_ISR)
   STM32_EXTI38_ISR(pr, 38);
diff --git a/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti19-21.inc b/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti19-21.inc
index 670fbdfb9..f127b07ee 100644
--- a/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti19-21.inc
+++ b/os/hal/ports/STM32/LLD/EXTIv1/stm32_exti19-21.inc
@@ -86,10 +86,10 @@ OSAL_IRQ_HANDLER(STM32_EXTI1921_HANDLER) {
   (void)pr;
 
 #if defined(STM32_EXTI19_ISR)
-  STM32_EXTI16_ISR(pr, 19);
+  STM32_EXTI19_ISR(pr, 19);
 #endif
 #if defined(STM32_EXTI21_ISR)
-  STM32_EXTI16_ISR(pr, 21);
+  STM32_EXTI19_ISR(pr, 21);
 #endif
 
   OSAL_IRQ_EPILOGUE();
diff --git a/readme.txt b/readme.txt
index 6717469ab..8e7b3f952 100644
--- a/readme.txt
+++ b/readme.txt
@@ -128,6 +128,8 @@
        MEMS Accelerometers.
 - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1).
 - NEW: Added latency measurement test application.
+- FIX: Fixed incorrect IRQ vector for PVM (bug #1146)
+       (backported to 20.3.3)
 - 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)