diff --git a/neorv32 b/neorv32
index d8f46ac..9700121 160000
--- a/neorv32
+++ b/neorv32
@@ -1 +1 @@
-Subproject commit d8f46ac38bb1a70729698cb30732dbe60e0be2bb
+Subproject commit 97001213ed28d1ae6b9d1fa60a3c32ae981e0b6b
diff --git a/osflow/filesets.mk b/osflow/filesets.mk
index cc992c4..c3d8ef6 100644
--- a/osflow/filesets.mk
+++ b/osflow/filesets.mk
@@ -1,5 +1,6 @@
-NEORV32_CORE_SRC :=                             \
+NEORV32_CORE_SRC :=                                 \
   ../neorv32/rtl/core/neorv32_package.vhd           \
+  ../neorv32/rtl/core/neorv32_bus.vhd               \
   ../neorv32/rtl/core/neorv32_clockgate.vhd         \
   ../neorv32/rtl/core/neorv32_fifo.vhd              \
   ../neorv32/rtl/core/neorv32_cpu_decompressor.vhd  \
@@ -15,7 +16,6 @@ NEORV32_CORE_SRC :=                             \
   ../neorv32/rtl/core/neorv32_cpu_lsu.vhd           \
   ../neorv32/rtl/core/neorv32_cpu_pmp.vhd           \
   ../neorv32/rtl/core/neorv32_cpu.vhd               \
-  ../neorv32/rtl/core/neorv32_intercon.vhd          \
   ../neorv32/rtl/core/neorv32_cache.vhd             \
   ../neorv32/rtl/core/neorv32_dma.vhd               \
   ../neorv32/rtl/core/neorv32_boot_rom.vhd          \
@@ -37,6 +37,7 @@ NEORV32_CORE_SRC :=                             \
   ../neorv32/rtl/core/neorv32_onewire.vhd           \
   ../neorv32/rtl/core/neorv32_slink.vhd             \
   ../neorv32/rtl/core/neorv32_crc.vhd               \
+  ../neorv32/rtl/core/neorv32_sys.vhd               \
   ../neorv32/rtl/core/neorv32_sysinfo.vhd           \
   ../neorv32/rtl/core/neorv32_debug_dtm.vhd         \
   ../neorv32/rtl/core/neorv32_debug_dm.vhd          \
diff --git a/radiant/UPduino_v3/neorv32_upduino_v3.rdf b/radiant/UPduino_v3/neorv32_upduino_v3.rdf
index 3b24830..d368f09 100644
--- a/radiant/UPduino_v3/neorv32_upduino_v3.rdf
+++ b/radiant/UPduino_v3/neorv32_upduino_v3.rdf
@@ -81,7 +81,7 @@
         <Source name="../../neorv32/rtl/core/neorv32_gptmr.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
-        <Source name="../../neorv32/rtl/core/neorv32_intercon.vhd" type="VHDL" type_short="VHDL">
+        <Source name="../../neorv32/rtl/core/neorv32_bus.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
         <Source name="../../neorv32/rtl/core/neorv32_mtime.vhd" type="VHDL" type_short="VHDL">
@@ -105,6 +105,9 @@
         <Source name="../../neorv32/rtl/core/neorv32_spi.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
+        <Source name="../../neorv32/rtl/core/neorv32_sys.vhd" type="VHDL" type_short="VHDL">
+            <Options lib="neorv32"/>
+        </Source>
         <Source name="../../neorv32/rtl/core/neorv32_sysinfo.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
diff --git a/radiant/iCEBreaker/iCEBreaker.rdf b/radiant/iCEBreaker/iCEBreaker.rdf
index d239e36..90c711d 100644
--- a/radiant/iCEBreaker/iCEBreaker.rdf
+++ b/radiant/iCEBreaker/iCEBreaker.rdf
@@ -81,7 +81,7 @@
         <Source name="../../neorv32/rtl/core/neorv32_gptmr.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
-        <Source name="../../neorv32/rtl/core/neorv32_intercon.vhd" type="VHDL" type_short="VHDL">
+        <Source name="../../neorv32/rtl/core/neorv32_bus.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
         <Source name="../../neorv32/rtl/core/neorv32_mtime.vhd" type="VHDL" type_short="VHDL">
@@ -105,6 +105,9 @@
         <Source name="../../neorv32/rtl/core/neorv32_spi.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>
+        <Source name="../../neorv32/rtl/core/neorv32_sys.vhd" type="VHDL" type_short="VHDL">
+            <Options lib="neorv32"/>
+        </Source>
         <Source name="../../neorv32/rtl/core/neorv32_sysinfo.vhd" type="VHDL" type_short="VHDL">
             <Options lib="neorv32"/>
         </Source>