diff --git a/spec/build/bsps/riscv/riscv/grp.yml b/spec/build/bsps/riscv/riscv/grp.yml
index 0643233f2c..b5d280a4be 100644
--- a/spec/build/bsps/riscv/riscv/grp.yml
+++ b/spec/build/bsps/riscv/riscv/grp.yml
@@ -32,6 +32,8 @@ links:
   uid: abi
 - role: build-dependency
   uid: obj
+- role: build-dependency
+  uid: objmmu
 - role: build-dependency
   uid: objsmp
 - role: build-dependency
diff --git a/spec/build/bsps/riscv/riscv/objmmu.yml b/spec/build/bsps/riscv/riscv/objmmu.yml
new file mode 100644
index 0000000000..f29023cbef
--- /dev/null
+++ b/spec/build/bsps/riscv/riscv/objmmu.yml
@@ -0,0 +1,17 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+build-type: objects
+cflags: []
+copyrights:
+- Copyright (C) 2026 Gedare Bloom
+cppflags: []
+cxxflags: []
+enabled-by: true
+includes: []
+install:
+- destination: ${BSP_INCLUDEDIR}
+  source:
+  - include/bsp/riscv-mmu.h
+links: []
+source:
+- bsps/riscv/shared/mmu/mmu-setup.c
+type: build
diff --git a/spec/build/cpukit/cpuopts.yml b/spec/build/cpukit/cpuopts.yml
index 10a9646b7e..4341dc0bed 100644
--- a/spec/build/cpukit/cpuopts.yml
+++ b/spec/build/cpukit/cpuopts.yml
@@ -57,6 +57,8 @@ links:
   uid: optposix
 - role: build-dependency
   uid: optprofiling
+- role: build-dependency
+  uid: optriscvmmuvirtualaddressbits
 - role: build-dependency
   uid: optriscvusesmode
 - role: build-dependency
diff --git a/spec/build/cpukit/optriscvmmuvirtualaddressbits.yml b/spec/build/cpukit/optriscvmmuvirtualaddressbits.yml
new file mode 100644
index 0000000000..c5971a8eeb
--- /dev/null
+++ b/spec/build/cpukit/optriscvmmuvirtualaddressbits.yml
@@ -0,0 +1,17 @@
+SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
+actions:
+- get-integer: null
+- define: null
+build-type: option
+copyrights:
+- Copyright (C) 2026 Gedare Bloom
+default:
+- enabled-by: true
+  value: 0
+description: |
+  TODO
+enabled-by: riscv
+format: '{}'
+links: []
+name: RISCV_MMU_VIRTUAL_ADDRESS_BITS
+type: build