diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in
index 918c5813f2..494758bd9d 100644
--- a/package/uclibc/Config.in
+++ b/package/uclibc/Config.in
@@ -106,8 +106,8 @@ config BR2_UCLIBC_TARGET_ARCH
 	default "xtensa"   if BR2_xtensa
 	default "i386"	   if BR2_i386
 	default "x86_64"   if BR2_x86_64
-	default "riscv64"  if BR2_riscv && BR2_ARCH_IS_64
-	default "riscv32"  if BR2_riscv && !BR2_ARCH_IS_64
+	default "riscv64"  if BR2_RISCV_64
+	default "riscv32"  if BR2_RISCV_32
 
 config BR2_UCLIBC_MIPS_ABI
 	string