diff --git a/configure b/configure
index 2d262017..f411f9fc 100755
--- a/configure
+++ b/configure
@@ -587,8 +587,8 @@ LIBOBJS
 qemu_targets
 enable_libsanitizer
 with_linux_headers_src
-with_pk_src
 with_dejagnu_src
+with_pk_src
 with_spike_src
 with_qemu_src
 with_gdb_src
@@ -1350,8 +1350,9 @@ Optional Packages:
   --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-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
@@ -1377,6 +1378,8 @@ Optional Packages:
   --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-dejagnu-src      Set dejagnu source path, use builtin source by
+                          default
   --with-linux-headers-src
                           Set linux-headers source path, use builtin source by
                           default
@@ -3328,7 +3331,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
 
@@ -3731,7 +3734,6 @@ else
 fi
 
 	}
-
 {
 
 # Check whether --with-dejagnu-src was given.
diff --git a/configure.ac b/configure.ac
index b838b642..ead25e6d 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,