diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d4bef7687..59ba2e27a8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 **Features**:
 
 - Enable structured logs by default; logs are now opt-out via `sentry_options_set_enable_logs(options, false)`. ([#1673](https://github.com/getsentry/sentry-native/pull/1673))
+- Crashpad: add macOS support for the `crashpad_wait_for_upload` flag. ([#1679](https://github.com/getsentry/sentry-native/pull/1679), [crashpad#152](https://github.com/getsentry/crashpad/pull/152))
 
 **Fixes**:
 
diff --git a/external/crashpad b/external/crashpad
index 38617eb5a0..17b7aca163 160000
--- a/external/crashpad
+++ b/external/crashpad
@@ -1 +1 @@
-Subproject commit 38617eb5a0799acade5dc4312f206e0e43642566
+Subproject commit 17b7aca1634f1a91018f1bba13f7941a2892e864
diff --git a/include/sentry.h b/include/sentry.h
index e7d3457fe9..3dde7bfeab 100644
--- a/include/sentry.h
+++ b/include/sentry.h
@@ -1840,8 +1840,8 @@ sentry_options_get_crash_reporting_mode(const sentry_options_t *opts);
  * Enables a wait for the crash report upload to be finished before shutting
  * down. This is disabled by default.
  *
- * This setting only has an effect when using the `crashpad` backend on Linux
- * and Windows.
+ * This setting only has an effect when using the `crashpad` backend on Linux,
+ * Windows and macOS.
  */
 SENTRY_API void sentry_options_set_crashpad_wait_for_upload(
     sentry_options_t *opts, int wait_for_upload);