diff --git a/configure b/configure
index c352490d35..8095688d7b 100755
--- a/configure
+++ b/configure
@@ -6601,7 +6601,8 @@ printf "%s\n" "#define DEFAULT_VARCH \"$withval\"" >>confdefs.h
 
 else $as_nop
 
-printf "%s\n" "#define DEFAULT_VARCH \"vlen:128
+printf "%s\n" "#define DEFAULT_VARCH \"vlen:128,elen:64\"" >>confdefs.h
+
 fi
 
 
diff --git a/riscv/riscv.ac b/riscv/riscv.ac
index e52c57016d..5785f27914 100644
--- a/riscv/riscv.ac
+++ b/riscv/riscv.ac
@@ -24,7 +24,7 @@ AC_ARG_WITH(varch,
 	[AS_HELP_STRING([--with-varch=vlen:128,elen:64],
 		[Sets the default vector config])],
   AC_DEFINE_UNQUOTED([DEFAULT_VARCH], "$withval", [Default value for --varch switch]),
-  AC_DEFINE_UNQUOTED([DEFAULT_VARCH], ["vlen:128,elen:64"], [Default value for --varch switch]))
+  AC_DEFINE([DEFAULT_VARCH], ["vlen:128,elen:64"], [Default value for --varch switch]))
 
 AC_ARG_WITH(target,
 	[AS_HELP_STRING([--with-target=riscv64-unknown-elf],