diff --git a/configure b/configure
index adb204c1..419132f7 100755
--- a/configure
+++ b/configure
@@ -1381,7 +1381,8 @@ Optional Packages:
                           use the Regex library from boost - it is possible to
                           specify a certain library for the linker e.g.
                           --with-boost-regex=boost_regex-gcc-mt-d-1_33_1
-  --with-isa=RV64IMAFDC   Sets the default RISC-V ISA
+  --with-isa=RV64IMAFDC_zicntr_zihpm
+                          Sets the default RISC-V ISA
   --with-priv=MSU         Sets the default RISC-V privilege modes supported
   --with-varch=vlen:128,elen:64
                           Sets the default vector config
@@ -5876,7 +5877,7 @@ _ACEOF
 else
 
 cat >>confdefs.h <<_ACEOF
-#define DEFAULT_ISA "RV64IMAFDC"
+#define DEFAULT_ISA "RV64IMAFDC_zicntr_zihpm"
 _ACEOF
 
 fi
diff --git a/riscv/riscv.ac b/riscv/riscv.ac
index 0b879dbb..e52c5701 100644
--- a/riscv/riscv.ac
+++ b/riscv/riscv.ac
@@ -9,10 +9,10 @@ AC_CHECK_LIB([boost_system], [main], [], [])
 AC_CHECK_LIB([boost_regex], [main], [], [])
 
 AC_ARG_WITH(isa,
-	[AS_HELP_STRING([--with-isa=RV64IMAFDC],
+	[AS_HELP_STRING([--with-isa=RV64IMAFDC_zicntr_zihpm],
 		[Sets the default RISC-V ISA])],
   AC_DEFINE_UNQUOTED([DEFAULT_ISA], "$withval", [Default value for --isa switch]),
-  AC_DEFINE_UNQUOTED([DEFAULT_ISA], "RV64IMAFDC", [Default value for --isa switch]))
+  AC_DEFINE_UNQUOTED([DEFAULT_ISA], "RV64IMAFDC_zicntr_zihpm", [Default value for --isa switch]))
 
 AC_ARG_WITH(priv,
 	[AS_HELP_STRING([--with-priv=MSU],