diff --git a/riscv/insns/czero_eqz.h b/riscv/insns/czero_eqz.h
new file mode 100644
index 00000000..24062af9
--- /dev/null
+++ b/riscv/insns/czero_eqz.h
@@ -0,0 +1,2 @@
+require_extension(EXT_ZICOND);
+WRITE_RD(RS2 == 0 ? 0 : RS1);
diff --git a/riscv/insns/czero_nez.h b/riscv/insns/czero_nez.h
new file mode 100644
index 00000000..cd6c8af7
--- /dev/null
+++ b/riscv/insns/czero_nez.h
@@ -0,0 +1,2 @@
+require_extension(EXT_ZICOND);
+WRITE_RD(RS2 != 0 ? 0 : RS1);
diff --git a/riscv/isa_parser.cc b/riscv/isa_parser.cc
index c074975d..00178ea9 100644
--- a/riscv/isa_parser.cc
+++ b/riscv/isa_parser.cc
@@ -220,6 +220,8 @@ isa_parser_t::isa_parser_t(const char* str, const char *priv)
       extension_table[EXT_ZICBOZ] = true;
     } else if (ext_str == "zicbop") {
     } else if (ext_str == "zicntr") {
+    } else if (ext_str == "zicond") {
+      extension_table[EXT_ZICOND] = true;
     } else if (ext_str == "zihpm") {
     } else if (ext_str == "sstc") {
         extension_table[EXT_SSTC] = true;
diff --git a/riscv/isa_parser.h b/riscv/isa_parser.h
index 01f46804..3ae9a16e 100644
--- a/riscv/isa_parser.h
+++ b/riscv/isa_parser.h
@@ -53,6 +53,7 @@ typedef enum {
   EXT_ZICBOM,
   EXT_ZICBOZ,
   EXT_ZICNTR,
+  EXT_ZICOND,
   EXT_ZIHPM,
   EXT_XZBP,
   EXT_XZBS,
diff --git a/riscv/riscv.mk.in b/riscv/riscv.mk.in
index 6e405690..a1540d47 100644
--- a/riscv/riscv.mk.in
+++ b/riscv/riscv.mk.in
@@ -1305,6 +1305,10 @@ riscv_insn_ext_cmo = \
 	cbo_inval \
 	cbo_zero \
 
+riscv_insn_ext_zicond = \
+        czero_eqz \
+        czero_nez \
+
 riscv_insn_list = \
 	$(riscv_insn_ext_a) \
 	$(riscv_insn_ext_c) \
@@ -1323,6 +1327,7 @@ riscv_insn_list = \
 	$(riscv_insn_priv) \
 	$(riscv_insn_svinval) \
 	$(riscv_insn_ext_cmo) \
+	$(riscv_insn_ext_zicond) \
 
 riscv_gen_srcs = $(addsuffix .cc,$(riscv_insn_list))