diff --git a/configure b/configure
index 2d262017697..ecaaf4d2a85 100755
--- a/configure
+++ b/configure
@@ -1345,41 +1345,41 @@ Optional Features:
   --enable-qemu-system    Build qemu with system-mode emulation
 
 Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-arch=rv64imafdc  Sets the base RISC-V ISA, defaults to rv64imafdc
-  --with-abi=lp64d        Sets the base RISC-V ABI, defaults to lp64d
-  --with-tune=rocket      Set the base RISC-V CPU, defaults to rocket
-  --with-isa-spec=2.2     Set the default ISA spec version, default to 2.2,
-                          available options: 2.2, 20190608, 20191213
-  --with-sim=qemu         Sets the base RISC-V Simulator, defaults to qemu
+  --with-PACKAGE[=ARG]     use PACKAGE [ARG=yes]
+  --without-PACKAGE        do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-arch=rv64imafdc   Sets the base RISC-V ISA, defaults to rv64imafdc
+  --with-abi=lp64d         Sets the base RISC-V ABI, defaults to lp64d
+  --with-tune=rocket       Set the base RISC-V CPU, defaults to rocket
+  --with-isa-spec=20191213 Set the default ISA spec version, default to 20191213,
+                           available options: 2.2, 20190608, 20191213
+  --with-sim=qemu          Sets the base RISC-V Simulator, defaults to qemu
   --with-multilib-generator
-                          Multi-libs configuration string, only supported for
-                          bare-metal/elf toolchain, this option implied
-                          --enable-multilib
-  --with-cmodel           Select the code model to use when building libc and
-                          libgcc [--with-cmodel=medlow]
-  --with-target-cflags    Add extra target flags for C for library code
-  --with-target-cxxflags  Add extra target flags for C++ for library code
+                           Multi-libs configuration string, only supported for
+                           bare-metal/elf toolchain, this option implied
+                           --enable-multilib
+  --with-cmodel            Select the code model to use when building libc and
+                           libgcc [--with-cmodel=medlow]
+  --with-target-cflags     Add extra target flags for C for library code
+  --with-target-cxxflags   Add extra target flags for C++ for library code
   --with-host=x86_64-w64-mingw32
-                          Sets the host for the tools, you probably want
-                          nothing
-  --without-system-zlib   use the builtin copy of zlib from GCC
-  --with-guile            Set which guile to use, if any
-  --with-gcc-src          Set gcc source path, use builtin source by default
-  --with-binutils-src     Set binutils source path, use builtin source by
-                          default
-  --with-newlib-src       Set newlib source path, use builtin source by
-                          default
-  --with-glibc-src        Set glibc source path, use builtin source by default
-  --with-musl-src         Set musl source path, use builtin source by default
-  --with-gdb-src          Set gdb source path, use builtin source by default
-  --with-qemu-src         Set qemu source path, use builtin source by default
-  --with-spike-src        Set spike source path, use builtin source by default
-  --with-pk-src           Set pk source path, use builtin source by default
+                           Sets the host for the tools, you probably want
+                           nothing
+  --without-system-zlib    use the builtin copy of zlib from GCC
+  --with-guile             Set which guile to use, if any
+  --with-gcc-src           Set gcc source path, use builtin source by default
+  --with-binutils-src      Set binutils source path, use builtin source by
+                           default
+  --with-newlib-src        Set newlib source path, use builtin source by
+                           default
+  --with-glibc-src         Set glibc source path, use builtin source by default
+  --with-musl-src          Set musl source path, use builtin source by default
+  --with-gdb-src           Set gdb source path, use builtin source by default
+  --with-qemu-src          Set qemu source path, use builtin source by default
+  --with-spike-src         Set spike source path, use builtin source by default
+  --with-pk-src            Set pk source path, use builtin source by default
   --with-linux-headers-src
-                          Set linux-headers source path, use builtin source by
-                          default
+                           Set linux-headers source path, use builtin source by
+                           default
 
 Some influential environment variables:
   CC          C compiler command
@@ -3328,7 +3328,7 @@ fi
 if test "${with_isa_spec+set}" = set; then :
   withval=$with_isa_spec;
 else
-  with_isa_spec=2.2
+  with_isa_spec=20191213
 
 fi
 
diff --git a/configure.ac b/configure.ac
index b838b64217f..ead25e6d572 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,10 +72,10 @@ AC_ARG_WITH(tune,
 	)
 
 AC_ARG_WITH(isa-spec,
-	[AS_HELP_STRING([--with-isa-spec=2.2],
-		[Set the default ISA spec version, default to 2.2, available options: 2.2, 20190608, 20191213])],
+	[AS_HELP_STRING([--with-isa-spec=20191213],
+		[Set the default ISA spec version, default to 20191213, available options: 2.2, 20190608, 20191213])],
 	[],
-	[with_isa_spec=2.2]
+	[with_isa_spec=20191213]
 	)
 
 AC_ARG_WITH(sim,