diff --git a/rdl/combpm_ctrl.rdl b/rdl/COMBPM.rdl
similarity index 95%
rename from rdl/combpm_ctrl.rdl
rename to rdl/COMBPM.rdl
index bb1345bdca12391ea3624b8b69285728605f7821..daea66370d6458109ed82cd1e2da7842cc2e1d2c 100644
--- a/rdl/combpm_ctrl.rdl
+++ b/rdl/COMBPM.rdl
@@ -1,6 +1,9 @@
+`include "COMBPM.vh" // Auto generated from FWK
 
+addrmap COMBPM {
 
-addrmap combpm_ctrl {
+    desyrdl_generate_hdl = true;
+    desyrdl_interface = "AXI4L";
 
     name="BPM protocol decoder controller";
 
diff --git a/tcl/main.tcl b/tcl/main.tcl
index 8a0a4ad769401abbeaf47efcb31625d2fca91149..eb4725808471cb1d67d8ee526d54bf4066003567 100644
--- a/tcl/main.tcl
+++ b/tcl/main.tcl
@@ -23,6 +23,8 @@ proc setSources {} {
 
 # ==============================================================================
 proc setAddressSpace {} {
+    variable AddressSpace
+    addAddressSpace AddressSpace "COMBPM" RDL {} ../rdl/COMBPM.rdl
 }
 
 # ==============================================================================