diff --git a/flist/nanosoc/nanosoc_chip_ip.flist b/flist/nanosoc/nanosoc_chip_ip.flist
index 2b0a1d08a40a5610daf495ee5a993dae538474be..f148dace48e1eeab7cf512d5a0e2ed2b0df5323a 100644
--- a/flist/nanosoc/nanosoc_chip_ip.flist
+++ b/flist/nanosoc/nanosoc_chip_ip.flist
@@ -22,6 +22,7 @@ $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_chip_pads.v
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_cpu.v
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_sysio.v
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_sys_ahb_decode.v
+$(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_subsystem.v
 
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_cs_rom_table.v
 $(NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_pin_mux.v
diff --git a/flist/nanosoc/nanosoc_matrix_ip.flist b/flist/nanosoc/nanosoc_matrix_ip.flist
index 9aa7281f3e9475e384f8ae6a712ec6def0785e2c..a9bbcb239e71fb9be8dd78596b6c36180d343fff 100644
--- a/flist/nanosoc/nanosoc_matrix_ip.flist
+++ b/flist/nanosoc/nanosoc_matrix_ip.flist
@@ -16,6 +16,6 @@
 +libext+.v+.vlib
 
 // =============    NanoSoC Bus Matrix IP search path    =============
-+incdir+$(NANOSOC_TECH_DIR)/system/verilog/gen_ahb_busmatrix/verilog/built/soclabs_4x7_AhbMatrix
++incdir+$(NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix
 
--y $(NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrixgen_ahb_busmatrix/verilog/built/soclabs_ahb32_4x7_busmatrix
\ No newline at end of file
+-y $(NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix
\ No newline at end of file
diff --git a/nanosoc b/nanosoc
index 8f599dbbb64ba2b39beea654dd211d7743f89f64..a0ac6688b4031dbd37877c2a665e4e375d918cbc 160000
--- a/nanosoc
+++ b/nanosoc
@@ -1 +1 @@
-Subproject commit 8f599dbbb64ba2b39beea654dd211d7743f89f64
+Subproject commit a0ac6688b4031dbd37877c2a665e4e375d918cbc