diff --git a/CHANGES.md b/CHANGES.md
index 24e2b1ad9..c11a884c3 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,7 @@
 	[> Added
 	--------
 	- cpu/vexiiriscv                : Added initial support.
+	- builder                       : Added default generation of exports with default names to output_dir.
 
 	[> Changed
 	----------
diff --git a/litex/soc/integration/builder.py b/litex/soc/integration/builder.py
index 9f7239a75..27f0747e0 100644
--- a/litex/soc/integration/builder.py
+++ b/litex/soc/integration/builder.py
@@ -108,11 +108,11 @@ class Builder:
         self.compile_gateware = compile_gateware
         self.build_backend    = build_backend
 
-        # Exports.
-        self.csr_csv  = csr_csv
-        self.csr_json = csr_json
-        self.csr_svd  = csr_svd
-        self.memory_x = memory_x
+        # 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")
 
         # BIOS.
         self.bios_lto     = bios_lto