diff --git a/sys/riscv/riscv/bus_space_asm.S b/sys/riscv/riscv/bus_space_asm.S
index 95e94ed040bc..6b65b7c4e785 100644
--- a/sys/riscv/riscv/bus_space_asm.S
+++ b/sys/riscv/riscv/bus_space_asm.S
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2016-2020 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Portions of this software were developed by SRI International and the
@@ -38,13 +38,13 @@ __FBSDID("$FreeBSD$");
 
 ENTRY(generic_bs_r_1)
 	add	a3, a1, a2
-	lb	a0, 0(a3)
+	lbu	a0, 0(a3)
 	ret
 END(generic_bs_r_1)
 
 ENTRY(generic_bs_r_2)
 	add	a3, a1, a2
-	lh	a0, 0(a3)
+	lhu	a0, 0(a3)
 	ret
 END(generic_bs_r_2)
 
diff --git a/sys/riscv/riscv/support.S b/sys/riscv/riscv/support.S
index 1de905fdf843..3f0ec08ac768 100644
--- a/sys/riscv/riscv/support.S
+++ b/sys/riscv/riscv/support.S
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2015-2018 Ruslan Bukin <br@bsdpad.com>
+ * Copyright (c) 2015-2020 Ruslan Bukin <br@bsdpad.com>
  * All rights reserved.
  *
  * Portions of this software were developed by SRI International and the
@@ -102,7 +102,7 @@ ENTRY(fubyte)
 	la	a6, fsu_fault		/* Load the fault handler */
 	SET_FAULT_HANDLER(a6, a1)	/* And set it */
 	ENTER_USER_ACCESS(a1)
-	lb	a0, 0(a0)		/* Try loading the data */
+	lbu	a0, 0(a0)		/* Try loading the data */
 	EXIT_USER_ACCESS(a1)
 	SET_FAULT_HANDLER(x0, a1)	/* Reset the fault handler */
 	ret				/* Return */
@@ -117,7 +117,7 @@ ENTRY(fuword16)
 	la	a6, fsu_fault		/* Load the fault handler */
 	SET_FAULT_HANDLER(a6, a1)	/* And set it */
 	ENTER_USER_ACCESS(a1)
-	lh	a0, 0(a0)		/* Try loading the data */
+	lhu	a0, 0(a0)		/* Try loading the data */
 	EXIT_USER_ACCESS(a1)
 	SET_FAULT_HANDLER(x0, a1)	/* Reset the fault handler */
 	ret				/* Return */