diff --git a/include/libopenstm32/flash.h b/include/libopenstm32/flash.h
index 9d7bb2a8..49e5b95a 100644
--- a/include/libopenstm32/flash.h
+++ b/include/libopenstm32/flash.h
@@ -31,14 +31,14 @@
 
 /* --- FLASH registers ----------------------------------------------------- */
 
-#define FLASH_ACR			MMIO32(FLASH_BASE + 0x00)
-#define FLASH_KEYR			MMIO32(FLASH_BASE + 0x04)
-#define FLASH_OPTKEYR			MMIO32(FLASH_BASE + 0x08)
-#define FLASH_SR			MMIO32(FLASH_BASE + 0x0C)
-#define FLASH_CR			MMIO32(FLASH_BASE + 0x10)
-#define FLASH_AR			MMIO32(FLASH_BASE + 0x14)
-#define FLASH_OBR			MMIO32(FLASH_BASE + 0x1C)
-#define FLASH_WRPR			MMIO32(FLASH_BASE + 0x20)
+#define FLASH_ACR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x00)
+#define FLASH_KEYR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x04)
+#define FLASH_OPTKEYR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x08)
+#define FLASH_SR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x0C)
+#define FLASH_CR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x10)
+#define FLASH_AR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x14)
+#define FLASH_OBR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x1C)
+#define FLASH_WRPR			MMIO32(FLASH_MEM_INTERFACE_BASE + 0x20)
 
 /* --- FLASH_ACR values ---------------------------------------------------- */