diff --git a/CHANGELOG.md b/CHANGELOG.md
index dad97788..8cdfa9ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Packaging
 
 - Warn when modules are imported on PyPy 3.7 versions older than PyPy 7.3.8, as they are known to have binary compatibility issues. [#2217](https://github.com/PyO3/pyo3/pull/2217)
+- Ensure build script of `pyo3-ffi` runs before that of `pyo3` to fix cross compilation. [#2224](https://github.com/PyO3/pyo3/pull/2224)
 
 ## [0.16.1] - 2022-03-05
 
diff --git a/Cargo.toml b/Cargo.toml
index 4d239789..86e57bc6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -51,6 +51,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0.61"
 
 [build-dependencies]
+pyo3-ffi = { path = "pyo3-ffi", version = "=0.16.1" }
 pyo3-build-config = { path = "pyo3-build-config", version = "0.16.1", features = ["resolve-config"] }
 
 [features]