diff --git a/decode.c b/decode.c
index 77fa568..33214bb 100644
--- a/decode.c
+++ b/decode.c
@@ -11,13 +11,13 @@
 
 #define FD_DECODE_TABLE_DATA
 static __attribute__((aligned(16))) const uint16_t _decode_table[] = {
-#include <fadec-decode-table.inc>
+#include <fadec-table.inc>
 };
 #undef FD_DECODE_TABLE_DATA
 
 // Defines FD_TABLE_OFFSET_32 and FD_TABLE_OFFSET_64, if available
 #define FD_DECODE_TABLE_DEFINES
-#include <fadec-decode-table.inc>
+#include <fadec-table.inc>
 #undef FD_DECODE_TABLE_DEFINES
 
 enum DecodeMode {
diff --git a/fadec.h b/fadec.h
index 6381c75..6459419 100644
--- a/fadec.h
+++ b/fadec.h
@@ -29,10 +29,8 @@ typedef enum {
 } FdReg;
 
 typedef enum {
-#define FD_DECODE_TABLE_MNEMONICS
 #define FD_MNEMONIC(name,value) FDI_ ## name = value,
-#include <fadec-decode-table.inc>
-#undef FD_DECODE_TABLE_MNEMONICS
+#include <fadec-mnems.inc>
 #undef FD_MNEMONIC
 } FdInstrType;
 
diff --git a/format.c b/format.c
index 9642612..9e77da0 100644
--- a/format.c
+++ b/format.c
@@ -9,13 +9,13 @@
 
 #define FD_DECODE_TABLE_STRTAB1
 static const char* _mnemonic_str =
-#include <fadec-decode-table.inc>
+#include <fadec-table.inc>
 ;
 #undef FD_DECODE_TABLE_STRTAB1
 
 #define FD_DECODE_TABLE_STRTAB2
 static const uint16_t _mnemonic_offs[] = {
-#include <fadec-decode-table.inc>
+#include <fadec-table.inc>
 };
 #undef FD_DECODE_TABLE_STRTAB2
 
diff --git a/meson.build b/meson.build
index a1d2f5c..d1f55f5 100644
--- a/meson.build
+++ b/meson.build
@@ -57,9 +57,11 @@ endif
 instr_data = custom_target('tables',
                            command: [python3, '@INPUT0@', '@INPUT1@', '@OUTPUT@'] + generate_args,
                            input: files('parseinstrs.py', 'instrs.txt'),
-                           output: ['fadec-decode-table.inc'],
+                           output: [
+                             'fadec-mnems.inc', 'fadec-table.inc'
+                           ],
                            install: true,
-                           install_dir: get_option('includedir'))
+                           install_dir: [get_option('includedir'), false])
 
 libfadec = static_library('fadec', 'decode.c', 'format.c', instr_data,
                           install: true)
diff --git a/parseinstrs.py b/parseinstrs.py
index 0423196..af61d98 100644
--- a/parseinstrs.py
+++ b/parseinstrs.py
@@ -398,8 +398,6 @@ def bytes_to_table(data, notes):
 template = """// Auto-generated file -- do not modify!
 #if defined(FD_DECODE_TABLE_DATA)
 {hex_table}
-#elif defined(FD_DECODE_TABLE_MNEMONICS)
-{mnemonic_list}
 #elif defined(FD_DECODE_TABLE_STRTAB1)
 {mnemonic_cstr}
 #elif defined(FD_DECODE_TABLE_STRTAB2)
@@ -416,7 +414,8 @@ if __name__ == "__main__":
     parser.add_argument("--32", dest="modes", action="append_const", const=32)
     parser.add_argument("--64", dest="modes", action="append_const", const=64)
     parser.add_argument("table", type=argparse.FileType('r'))
-    parser.add_argument("output", type=argparse.FileType('w'))
+    parser.add_argument("decode_mnems", type=argparse.FileType('w'))
+    parser.add_argument("decode_table", type=argparse.FileType('w'))
     args = parser.parse_args()
 
     entries = []
@@ -429,6 +428,9 @@ if __name__ == "__main__":
     mnemonics = sorted({desc.mnemonic for _, desc in entries})
     mnemonics_lut = {name: mnemonics.index(name) for name in mnemonics}
 
+    decode_mnems_lines = ["FD_MNEMONIC(%s,%d)"%e for e in mnemonics_lut.items()]
+    args.decode_mnems.write("\n".join(decode_mnems_lines))
+
     modes = [32, 64]
     table = Table(root_count=len(args.modes))
     for opcode, desc in entries:
@@ -446,11 +448,10 @@ if __name__ == "__main__":
 
     defines = ["FD_TABLE_OFFSET_%d %d"%k for k in zip(args.modes, root_offsets)]
 
-    file = template.format(
+    decode_table = template.format(
         hex_table=bytes_to_table(table_data, annotations),
-        mnemonic_list="\n".join("FD_MNEMONIC(%s,%d)"%entry for entry in mnemonics_lut.items()),
         mnemonic_cstr=mnemonic_cstr,
         mnemonic_offsets=",".join(str(off) for off in mnemonic_tab),
         defines="\n".join("#define " + line for line in defines),
     )
-    args.output.write(file)
+    args.decode_table.write(decode_table)