diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h
index 9d61883eea9..8af34ba2b33 100644
--- a/include/opcode/riscv-opc.h
+++ b/include/opcode/riscv-opc.h
@@ -3860,10 +3860,10 @@
 #define MASK_ARCV_BITREV 0xfe00707f
 
 /* Vendor-specific (ARC-V) BITSTREAM extension.  */
-#define MATCH_ARCV_BSPEEK 0x4802205b
-#define MASK_ARCV_BSPEEK 0xfe0ff07f
-#define MATCH_ARCV_BSPOP 0x4802a05b
-#define MASK_ARCV_BSPOP 0xfe0ff07f
+#define MATCH_ARCV_BSPEEK 0x4840105b
+#define MASK_ARCV_BSPEEK 0xfff0707f
+#define MATCH_ARCV_BSPOP 0x4850105b
+#define MASK_ARCV_BSPOP 0xfff0707f
 #define MATCH_ARCV_BSPUSH 0x0000105b
 #define MASK_ARCV_BSPUSH 0xfe00707f
 
diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c
index ae81cd22071..5f7f8a0f0ca 100644
--- a/opcodes/riscv-opc.c
+++ b/opcodes/riscv-opc.c
@@ -3766,8 +3766,8 @@ const struct riscv_opcode riscv_opcodes[] =
 { "arcv.bitrev", 0, INSN_CLASS_XARCVBITREV, "d,s,t", MATCH_ARCV_BITREV, MASK_ARCV_BITREV, match_opcode, 0 },
 
 /* Vendor-specific (ARC-V) BITSTREAM extension.  */
-{ "arcv.bspeek", 0, INSN_CLASS_XARCVBITSTREAM, "d,t", MATCH_ARCV_BSPEEK, MASK_ARCV_BSPEEK, match_opcode, 0 },
-{ "arcv.bspop", 0, INSN_CLASS_XARCVBITSTREAM, "d,t", MATCH_ARCV_BSPOP, MASK_ARCV_BSPOP, match_opcode, 0 },
+{ "arcv.bspeek", 0, INSN_CLASS_XARCVBITSTREAM, "d,s", MATCH_ARCV_BSPEEK, MASK_ARCV_BSPEEK, match_opcode, 0 },
+{ "arcv.bspop", 0, INSN_CLASS_XARCVBITSTREAM, "d,s", MATCH_ARCV_BSPOP, MASK_ARCV_BSPOP, match_opcode, 0 },
 { "arcv.bspush", 0, INSN_CLASS_XARCVBITSTREAM, "d,s,t", MATCH_ARCV_BSPUSH, MASK_ARCV_BSPUSH, match_opcode, 0 },
 
 /* Vendor-specific (ARC-V) VDSP extension.  */