diff --git a/Makefrag b/Makefrag
index aee19ed4..1eb34d55 100644
--- a/Makefrag
+++ b/Makefrag
@@ -598,5 +598,5 @@ bt_vvadd.riscv\
 disasm := 2>
 which_disasm := $(shell which riscv-dis)
 ifneq ($(which_disasm),)
-	disasm := 3>&1 1>&2 2>&3 | $(which_disasm) >
+	disasm := 3>&1 1>&2 2>&3 | $(which_disasm) --extension=hwacha >
 endif
diff --git a/riscv-tools b/riscv-tools
index 16908b2a..cc599fce 160000
--- a/riscv-tools
+++ b/riscv-tools
@@ -1 +1 @@
-Subproject commit 16908b2a8dcf9e8b4e3fdf1c962e123067356dba
+Subproject commit cc599fce1ad7f0823c032f7c8dde0c0c363bad7d