diff --git a/opcodes-rv32zbs b/opcodes-rv32zbs
deleted file mode 100644
index 1de3fc23..00000000
--- a/opcodes-rv32zbs
+++ /dev/null
@@ -1,9 +0,0 @@
-bclr       rd rs1 rs2 31..25=36 14..12=1 6..2=0x0C 1..0=3
-bset       rd rs1 rs2 31..25=20 14..12=1 6..2=0x0C 1..0=3
-binv       rd rs1 rs2 31..25=52 14..12=1 6..2=0x0C 1..0=3
-bext       rd rs1 rs2 31..25=36 14..12=5 6..2=0x0C 1..0=3
-
-bclri      rd rs1 31..26=18 shamt 14..12=1 6..2=0x04 1..0=3
-bseti      rd rs1 31..26=10 shamt 14..12=1 6..2=0x04 1..0=3
-binvi      rd rs1 31..26=26 shamt 14..12=1 6..2=0x04 1..0=3
-bexti      rd rs1 31..26=18 shamt 14..12=5 6..2=0x04 1..0=3
diff --git a/rv32_zbs b/rv32_zbs
new file mode 100644
index 00000000..14ac441f
--- /dev/null
+++ b/rv32_zbs
@@ -0,0 +1,5 @@
+$pseudo_op rv64_zbs::bclri bclri rd rs1 31..25=0x24 shamtw 14..12=1 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::bexti bexti rd rs1 31..25=0x24 shamtw 14..12=5 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::binvi binvi rd rs1 31..25=0x34 shamtw 14..12=1 6..2=0x04 1..0=3
+$pseudo_op rv64_zbs::bseti bseti rd rs1 31..25=0x14 shamtw 14..12=1 6..2=0x04 1..0=3
+
diff --git a/rv64_zbs b/rv64_zbs
new file mode 100644
index 00000000..d3203a6d
--- /dev/null
+++ b/rv64_zbs
@@ -0,0 +1,5 @@
+bclri       rd rs1 31..26=0x12 shamt 14..12=1 6..2=0x04 1..0=3
+bexti       rd rs1 31..26=0x12 shamt 14..12=5 6..2=0x04 1..0=3
+binvi       rd rs1 31..26=0x1a shamt 14..12=1 6..2=0x04 1..0=3
+bseti       rd rs1 31..26=0x0a shamt 14..12=1 6..2=0x04 1..0=3
+
diff --git a/rv_zbs b/rv_zbs
new file mode 100644
index 00000000..19490722
--- /dev/null
+++ b/rv_zbs
@@ -0,0 +1,5 @@
+bclr rd rs1 rs2 31..25=0x24 14..12=1 6..2=0x0C 1..0=3
+bext rd rs1 rs2 31..25=36 14..12=5 6..2=0x0C 1..0=3
+binv rd rs1 rs2 31..25=52 14..12=1 6..2=0x0C 1..0=3
+bset rd rs1 rs2 31..25=20 14..12=1 6..2=0x0C 1..0=3
+