diff --git a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_OLIMEX_STM32E407_F407ZG/system_clock.c b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_OLIMEX_STM32E407_F407ZG/system_clock.c
index 91452cf0c5..82d73a6b1b 100644
--- a/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_OLIMEX_STM32E407_F407ZG/system_clock.c
+++ b/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407xG/TARGET_OLIMEX_STM32E407_F407ZG/system_clock.c
@@ -31,6 +31,7 @@
 
 #include "stm32f4xx.h"
 #include "mbed_error.h"
+#include "nvic_addr.h"
 
 /*!< Uncomment the following line if you need to relocate your vector Table in
      Internal SRAM. */
@@ -94,7 +95,7 @@ void SystemInit(void)
 #ifdef VECT_TAB_SRAM
     SCB->VTOR = SRAM_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal SRAM */
 #else
-    SCB->VTOR = FLASH_BASE | VECT_TAB_OFFSET; /* Vector Table Relocation in Internal FLASH */
+    SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; /* Vector Table Relocation in Internal FLASH */
 #endif
 
 }
diff --git a/targets/targets.json b/targets/targets.json
index 7624a11858..75f84a01f5 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -4092,7 +4092,8 @@
             "USBDEVICE"
         ],
         "release_versions": ["5"],
-        "device_name": "STM32F407ZG"
+        "device_name": "STM32F407ZG",
+        "bootloader_supported": true
     },
     "DISCO_F429ZI": {
         "inherits": ["FAMILY_STM32"],
diff --git a/tools/arm_pack_manager/index.json b/tools/arm_pack_manager/index.json
index 6a92b82989..af7710c937 100644
--- a/tools/arm_pack_manager/index.json
+++ b/tools/arm_pack_manager/index.json
@@ -363617,7 +363617,11 @@
                 "units": 1
             }
         }, 
-        "sectors": null, 
+        "sectors": [
+            [134217728, 16384],
+            [134283264, 65536],
+            [134348800, 131072]
+        ],
         "sub_family": "STM32F407",
         "vendor": "STMicroelectronics:13"
     },