diff --git a/gmp-mparam.h b/gmp-mparam.h
index 46b71a9..1d4e087 100644
--- a/gmp-mparam.h
+++ b/gmp-mparam.h
@@ -75,9 +75,13 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-mparam-mipsel.h"
 #elif defined(__mips)
 #include "gmp-mparam-mips.h"
-#elif defined(__riscv64)
+#elif defined(__riscv)
+#if __riscv_xlen == 64
 #include "gmp-mparam-riscv64.h"
 #else
+#error "No support for riscv32"
+#endif
+#else
 #error "The gmp-devel package is not usable with the architecture."
 #endif
 
diff --git a/gmp.h b/gmp.h
index cddc111..0a91606 100644
--- a/gmp.h
+++ b/gmp.h
@@ -75,9 +75,13 @@ along with the GNU MP Library.  If not, see http://www.gnu.org/licenses/.  */
 #include "gmp-mipsel.h"
 #elif defined(__mips)
 #include "gmp-mips.h"
-#elif defined(__riscv64)
+#elif defined(__riscv)
+#if __riscv_xlen == 64
 #include "gmp-riscv64.h"
 #else
+#error "No support for riscv32"
+#endif
+#else
 #error "The gmp-devel package is not usable with the architecture."
 #endif