diff --git a/arch/common/Kconfig b/arch/common/Kconfig
index 8b860917977d1..52c157c32e261 100644
--- a/arch/common/Kconfig
+++ b/arch/common/Kconfig
@@ -12,7 +12,7 @@ config SEMIHOST
 	  a host computer that is running a debugger.
 	  Additional information can be found in:
 	  https://developer.arm.com/documentation/dui0471/m/what-is-semihosting-
-	  https://github.com/riscv/riscv-semihosting-spec/blob/main/riscv-semihosting-spec.adoc
+	  https://github.com/riscv-non-isa/riscv-semihosting/blob/main/riscv-semihosting.adoc
 	  This option is compatible with hardware and with QEMU, through the
 	  (automatic) use of the -semihosting-config switch when invoking it.
 
diff --git a/doc/hardware/arch/semihost.rst b/doc/hardware/arch/semihost.rst
index f7e2bdd24018f..7ea2fff3f87d4 100644
--- a/doc/hardware/arch/semihost.rst
+++ b/doc/hardware/arch/semihost.rst
@@ -68,5 +68,5 @@ API Reference
 .. doxygengroup:: semihost
 
 .. _ARM Github documentation: https://github.com/ARM-software/abi-aa/blob/main/semihosting/semihosting.rst
-.. _RISC-V Github documentation: https://github.com/riscv/riscv-semihosting-spec/blob/main/riscv-semihosting-spec.adoc
+.. _RISC-V Github documentation: https://github.com/riscv-non-isa/riscv-semihosting/blob/main/riscv-semihosting.adoc
 .. _GDB File-I/O Remote Protocol: https://sourceware.org/gdb/current/onlinedocs/gdb.html/File_002dI_002fO-Remote-Protocol-Extension.html
diff --git a/include/zephyr/arch/common/semihost.h b/include/zephyr/arch/common/semihost.h
index 98a8a60cf8831..c92c578c31787 100644
--- a/include/zephyr/arch/common/semihost.h
+++ b/include/zephyr/arch/common/semihost.h
@@ -8,7 +8,7 @@
  * https://github.com/ARM-software/abi-aa/blob/main/semihosting/semihosting.rst
  *
  * RISC-V semihosting also follows these conventions:
- * https://github.com/riscv/riscv-semihosting-spec/blob/main/riscv-semihosting-spec.adoc
+ * https://github.com/riscv-non-isa/riscv-semihosting/blob/main/riscv-semihosting.adoc
  */
 
 /**