diff --git a/src/st-util/gdb-server.c b/src/st-util/gdb-server.c
index dfe71cbb..9d06293e 100644
--- a/src/st-util/gdb-server.c
+++ b/src/st-util/gdb-server.c
@@ -355,7 +355,8 @@ char* make_memory_map(stlink_t *sl) {
     if (sl->chip_id == STM32_CHIPID_F4 ||
         sl->chip_id == STM32_CHIPID_F446 ||
         sl->chip_id == STM32_CHIPID_F411xx) {
-            strcpy(map, memory_map_template_F4);
+        snprintf(map, sz, memory_map_template_F4,
+                 sl->sram_size);
     } else if (sl->chip_id == STM32_CHIPID_F4_DE) {
         strcpy(map, memory_map_template_F4_DE);
     } else if (sl->core_id == STM32_CORE_ID_M7F_SWD) {
diff --git a/src/st-util/memory-map.h b/src/st-util/memory-map.h
index 6f34eeda..37acb62e 100644
--- a/src/st-util/memory-map.h
+++ b/src/st-util/memory-map.h
@@ -8,7 +8,7 @@ static const char* const memory_map_template_F4 =
     "<memory-map>"
     "  <memory type=\"rom\" start=\"0x00000000\" length=\"0x100000\"/>"     // code = sram, bootrom or flash; flash is bigger
     "  <memory type=\"ram\" start=\"0x10000000\" length=\"0x10000\"/>"      // ccm ram
-    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x20000\"/>"      // sram
+    "  <memory type=\"ram\" start=\"0x20000000\" length=\"0x%x\"/>"         // sram
     "  <memory type=\"flash\" start=\"0x08000000\" length=\"0x10000\">"     // Sectors 0...3
     "    <property name=\"blocksize\">0x4000</property>"                    // 16 kB
     "  </memory>"