diff --git a/gateware/common/rtl/picorv32.v b/gateware/common/rtl/picorv32.v
index 74bdc60..2e59215 100644
--- a/gateware/common/rtl/picorv32.v
+++ b/gateware/common/rtl/picorv32.v
@@ -43,7 +43,7 @@
 `endif
 
 // uncomment this for register file in extra module
-// `define PICORV32_REGS picorv32_regs
+`define PICORV32_REGS picorv32_ice40_regs
 
 // this macro can be used to check if the verilog files in your
 // design are read in the correct order.
diff --git a/gateware/common/rtl/picorv32_ice40_regs.v b/gateware/common/rtl/picorv32_ice40_regs.v
new file mode 100644
index 0000000..064c238
--- /dev/null
+++ b/gateware/common/rtl/picorv32_ice40_regs.v
@@ -0,0 +1,43 @@
+/*
+ * picorv32_ice40_regs.v
+ *
+ * vim: ts=4 sw=4
+ *
+ * Implementation of register file for the PicoRV32 on iCE40
+ *
+ * Copyright (C) 2020  Sylvain Munaut <tnt@246tNt.com>
+ * SPDX-License-Identifier: CERN-OHL-P-2.0
+ */
+
+`default_nettype none
+
+module picorv32_ice40_regs (
+	input  wire        clk,
+	input  wire        wen,
+	input  wire  [5:0] waddr,
+	input  wire  [5:0] raddr1,
+	input  wire  [5:0] raddr2,
+	input  wire [31:0] wdata,
+	output wire [31:0] rdata1,
+	output wire [31:0] rdata2
+);
+
+	ice40_ebr #(
+		.READ_MODE(0),
+		.WRITE_MODE(0),
+		.MASK_WORKAROUND(0),
+		.NEG_WR_CLK(0),
+		.NEG_RD_CLK(1)
+	) regs[3:0] (
+		.wr_addr ({ 4{2'b00, waddr} }),
+		.wr_data ({ 2{wdata} }),
+		.wr_mask (64'h0000000000000000),
+		.wr_ena  (wen),
+		.wr_clk  (clk),
+		.rd_addr ({2'b00, raddr2, 2'b00, raddr2, 2'b00, raddr1, 2'b00, raddr1}),
+		.rd_data ({rdata2, rdata1}),
+		.rd_ena  (1'b1),
+		.rd_clk  (clk)
+	);
+
+endmodule // picorv32_ice40_regs
diff --git a/gateware/e1-tracer/Makefile b/gateware/e1-tracer/Makefile
index cda5efc..b92a258 100644
--- a/gateware/e1-tracer/Makefile
+++ b/gateware/e1-tracer/Makefile
@@ -9,6 +9,7 @@
 PROJ_RTL_SRCS += $(addprefix ../common/rtl/, \
 	dfu_helper.v \
 	picorv32.v \
+	picorv32_ice40_regs.v \
 	soc_base.v \
 	soc_bram.v \
 	soc_iobuf.v \
diff --git a/gateware/icE1usb-proto/Makefile b/gateware/icE1usb-proto/Makefile
index 52f4b5a..59db8ff 100644
--- a/gateware/icE1usb-proto/Makefile
+++ b/gateware/icE1usb-proto/Makefile
@@ -9,6 +9,7 @@
 PROJ_RTL_SRCS += $(addprefix ../common/rtl/, \
 	dfu_helper.v \
 	picorv32.v \
+	picorv32_ice40_regs.v \
 	soc_base.v \
 	soc_bram.v \
 	soc_iobuf.v \
diff --git a/gateware/icE1usb/Makefile b/gateware/icE1usb/Makefile
index 96a5c47..ca1698a 100644
--- a/gateware/icE1usb/Makefile
+++ b/gateware/icE1usb/Makefile
@@ -13,6 +13,7 @@
 PROJ_RTL_SRCS += $(addprefix ../common/rtl/, \
 	dfu_helper.v \
 	picorv32.v \
+	picorv32_ice40_regs.v \
 	soc_base.v \
 	soc_bram.v \
 	soc_iobuf.v \