diff --git a/docs/markdown/Reference-tables.md b/docs/markdown/Reference-tables.md
index 989e6498b..9aa860906 100644
--- a/docs/markdown/Reference-tables.md
+++ b/docs/markdown/Reference-tables.md
@@ -57,6 +57,7 @@ set in the cross file.
 | riscv64             | 64 bit RISC-V Open ISA|
 | sparc               | 32 bit SPARC          |
 | sparc64             | SPARC v9 processor    |
+| s390x               | IBM zSystem s390x     |
 
 Any cpu family not listed in the above list is not guaranteed to
 remain stable in future releases.
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 28c26e2f2..6688c6201 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -86,6 +86,7 @@ known_cpu_families = (
     'ppc64',
     'riscv32',
     'riscv64',
+    's390x',
     'sparc',
     'sparc64',
     'x86',