diff --git a/.github/workflows/uniffi.yaml b/.github/workflows/uniffi.yaml
index 8052c534..975b8039 100644
--- a/.github/workflows/uniffi.yaml
+++ b/.github/workflows/uniffi.yaml
@@ -50,6 +50,11 @@ jobs:
             target: 'aarch64-unknown-linux-gnu'
             output: 'lib{0}.so'
             lib_dir: 'linux-aarch64'
+          - host: ubuntu-latest
+            target: 's390x-unknown-linux-gnu'
+            output: 'lib{0}.so'
+            lib_dir: 'linux-s390x'
+            extra_args: '--features bindgen'
 
     name: UniFFI - ${{ matrix.settings.target }}
     runs-on: ${{ matrix.settings.host }}
@@ -67,7 +72,7 @@ jobs:
         with:
           working-directory: ${{ env.UNIFFI_DIRECTORY }}
           target: ${{ matrix.settings.target }}
-          args: '--lib --release'
+          args: '--lib --release ${{ matrix.settings.extra_args }}'
 
       - name: Upload artifact
         uses: actions/upload-artifact@v4
diff --git a/Cross.toml b/Cross.toml
new file mode 100644
index 00000000..8472ad04
--- /dev/null
+++ b/Cross.toml
@@ -0,0 +1,3 @@
+[target.s390x-unknown-linux-gnu]
+image = "ghcr.io/cross-rs/s390x-unknown-linux-gnu:main"
+pre-build = ["apt-get update && apt-get install -y libclang-dev clang"]