diff --git a/sys/conf/Makefile.riscv b/sys/conf/Makefile.riscv
index 183fa6dd4482..a29390f2e851 100644
--- a/sys/conf/Makefile.riscv
+++ b/sys/conf/Makefile.riscv
@@ -46,6 +46,8 @@ SYSTEM_LD= @${LD} -N -m ${LD_EMULATION} -Bdynamic -T ${LDSCRIPT} ${_LDFLAGS} \
 CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
 .endif
 
+CFLAGS += -DMACHINE_ARCH=\"${TARGET_ARCH}\"
+
 # hack because genassym.c includes sys/bus.h which includes these.
 genassym.o: bus_if.h device_if.h
 
diff --git a/sys/riscv/include/param.h b/sys/riscv/include/param.h
index 94e18c580417..a017ef20f6f7 100644
--- a/sys/riscv/include/param.h
+++ b/sys/riscv/include/param.h
@@ -46,8 +46,12 @@
 #define	MACHINE		"riscv"
 #endif
 #ifndef MACHINE_ARCH
+#ifdef __riscv_float_abi_soft
+#define	MACHINE_ARCH	"riscv64sf"
+#else
 #define	MACHINE_ARCH	"riscv64"
 #endif
+#endif
 
 #ifdef SMP
 #ifndef MAXCPU