diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 27f0747e0..ca140d5ba 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -111,8 +111,8 @@ class Builder:
         # Exports (Generated by default to output_dir with default name unless explicitly specified).
         self.csr_csv  = csr_csv  if csr_csv  else os.path.join(self.output_dir, "csr.csv")
         self.csr_json = csr_json if csr_json else os.path.join(self.output_dir, "csr.json")
-        self.csr_svd  = csr_svd  if csr_svd  else os.path.join(self.output_dir, "csr.svd")
-        self.memory_x = memory_x if memory_x else os.path.join(self.output_dir, "memory.x")
+        self.csr_svd  = csr_svd
+        self.memory_x = memory_x
 
         # BIOS.
         self.bios_lto     = bios_lto