diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b37300cc..f3b5e4f4c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+**Fixes**:
+
+- Crashpad: namespace mpack to avoid ODR violation. ([#1476](https://github.com/getsentry/sentry-native/pull/1476), [crashpad#143](https://github.com/getsentry/crashpad/pull/143))
+
 ## 0.12.3
 
 **Fixes**:
diff --git a/external/crashpad b/external/crashpad
index 6e7536ec8..22121b6c0 160000
--- a/external/crashpad
+++ b/external/crashpad
@@ -1 +1 @@
-Subproject commit 6e7536ec8bd5ce060feb5410f43f35c4ae86237b
+Subproject commit 22121b6c00335ff5361e719d9f38b47dbb3a8d41