diff --git a/examples/arty.yml b/examples/arty.yml
index acb7fdb..890bbdf 100644
--- a/examples/arty.yml
+++ b/examples/arty.yml
@@ -33,6 +33,9 @@
     "user_ports_type":     "axi", # Type of ports (axi, wishbone, native)
     "user_ports_id_width": 32,    # AXI identifier width
 
+    # User FIFOs ---------------------------------------------------------------
+    "user_fifos_nb":       1,     # Number of user fifos
+
     # CSR Port -----------------------------------------------------------------
     "csr_expose": "False", # Expose CSR bus as I/Os
     "csr_align" : 32,      # CSR alignment
diff --git a/litedram/gen.py b/litedram/gen.py
index ba50e7f..b1d0377 100644
--- a/litedram/gen.py
+++ b/litedram/gen.py
@@ -46,6 +46,7 @@ from litedram.frontend.axi import *
 from litedram.frontend.wishbone import *
 from litedram.frontend.bist import LiteDRAMBISTGenerator
 from litedram.frontend.bist import LiteDRAMBISTChecker
+from litedram.frontend.fifo import LiteDRAMFIFO
 
 # IOs/Interfaces -----------------------------------------------------------------------------------
 
@@ -190,6 +191,21 @@ def get_axi_user_port_ios(_id, aw, dw, iw):
         ),
     ]
 
+def get_user_fifo_ios(_id, dw):
+    return [
+        ("user_fifo", _id,
+            # in
+            Subsignal("in_valid", Pins(1)),
+            Subsignal("in_ready", Pins(1)),
+            Subsignal("in_data",  Pins(dw)),
+
+            # out
+            Subsignal("out_valid", Pins(1)),
+            Subsignal("out_ready", Pins(1)),
+            Subsignal("out_data",  Pins(dw)),
+        ),
+    ]
+
 
 class Platform(XilinxPlatform):
     def __init__(self):
@@ -437,6 +453,32 @@ class LiteDRAMCore(SoCSDRAM):
         else:
             raise ValueError("Unsupported port type: {}".format(core_config["user_ports_type"]))
 
+        # User FIFOs -------------------------------------------------------------------------------
+        for i in range(core_config.get("user_fifos_nb", 0)):
+            platform.add_extension(get_user_fifo_ios(i, user_port.data_width))
+            _user_fifo_io = platform.request("user_fifo", i)
+            fifo = LiteDRAMFIFO(
+                data_width      = user_port.data_width,
+                base            = 0x00000000, # FIXME
+                depth           = 0x01000000, # FIXME
+                write_port      = self.sdram.crossbar.get_port("write"),
+                write_threshold = 0x01000000 - 32, # FIXME
+                read_port       = self.sdram.crossbar.get_port("read"),
+                read_threshold  = 32 # FIXME
+            )
+            self.submodules += fifo
+            self.comb += [
+                # in
+                fifo.sink.valid.eq(_user_fifo_io.in_valid),
+                _user_fifo_io.in_ready.eq(fifo.sink.ready),
+                fifo.sink.data.eq(_user_fifo_io.in_data),
+
+                # out
+                _user_fifo_io.out_valid.eq(fifo.source.valid),
+                fifo.source.ready.eq(_user_fifo_io.out_ready),
+                _user_fifo_io.out_data.eq(fifo.source.data),
+            ]
+
 # Build --------------------------------------------------------------------------------------------
 
 def main():
@@ -460,7 +502,7 @@ def main():
 
     # Generate core --------------------------------------------------------------------------------
     platform = Platform()
-    soc      = LiteDRAMCore(platform, core_config, integrated_rom_size=0x6000)
+    soc      = LiteDRAMCore(platform, core_config, integrated_rom_size=0x6000, integrated_sram_size=0x1000)
     builder  = Builder(soc, output_dir="build", compile_gateware=False)
     vns      = builder.build(build_name="litedram_core", regular_comb=False)