diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 5d0e69458b4c..1c2c32568da4 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -367,9 +367,9 @@ CFLAGS += -mcpu=8540 -Wa,-me500 -mspe=yes -mabi=spe -mfloat-gprs=double
 
 .if ${MACHINE_CPUARCH} == "riscv"
 .if ${MACHINE_ARCH:Mriscv*sf}
-CFLAGS += -march=rv64imac -mabi=lp64
+CFLAGS += -march=rv64ima -mabi=lp64
 .else
-CFLAGS += -march=rv64imafdc -mabi=lp64d
+CFLAGS += -march=rv64imafd -mabi=lp64d
 .endif
 .endif
 
diff --git a/stand/defs.mk b/stand/defs.mk
index fc810f294793..13314812bc85 100644
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -103,7 +103,7 @@ CFLAGS+=	-ffreestanding ${CFLAGS_NO_SIMD}
 .if ${MACHINE_CPUARCH} == "aarch64"
 CFLAGS+=	-mgeneral-regs-only -fPIC
 .elif ${MACHINE_CPUARCH} == "riscv"
-CFLAGS+=	-march=rv64imac -mabi=lp64
+CFLAGS+=	-march=rv64ima -mabi=lp64
 .else
 CFLAGS+=	-msoft-float
 .endif
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index 910992c3ef7b..a58e0375c909 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -131,7 +131,7 @@ INLINE_LIMIT?=	8000
 .endif
 
 .if ${MACHINE_CPUARCH} == "riscv"
-CFLAGS.gcc+=	-mcmodel=medany -march=rv64imafdc -mabi=lp64
+CFLAGS.gcc+=	-mcmodel=medany -march=rv64imafd -mabi=lp64
 INLINE_LIMIT?=	8000
 .endif