diff --git a/CHANGELOG.md b/CHANGELOG.md
index 530d3b729..cb21b2a78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@
 
 - Provide `before_send_transaction` callback. ([#1236](https://github.com/getsentry/sentry-native/pull/1236))
 - Add support for capturing events with local scopes. ([#1248](https://github.com/getsentry/sentry-native/pull/1248))
+- Add Windows support for the `crashpad_wait_for_upload` flag. ([#1255](https://github.com/getsentry/sentry-native/pull/1255), [crashpad#126](https://github.com/getsentry/crashpad/pull/126))
 
 **Fixes**:
 
diff --git a/external/crashpad b/external/crashpad
index a17b30d42..b2653919b 160000
--- a/external/crashpad
+++ b/external/crashpad
@@ -1 +1 @@
-Subproject commit a17b30d42ec667c92a99285429e4edf2f7196698
+Subproject commit b2653919b42cf310482a9e33620cf82e952b5d2d
diff --git a/include/sentry.h b/include/sentry.h
index b9d37fa2a..7c3c8b8e5 100644
--- a/include/sentry.h
+++ b/include/sentry.h
@@ -1374,7 +1374,8 @@ SENTRY_API void sentry_options_set_system_crash_reporter_enabled(
  * 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.
+ * This setting only has an effect when using the `crashpad` backend on Linux
+ * and Windows.
  */
 SENTRY_API void sentry_options_set_crashpad_wait_for_upload(
     sentry_options_t *opts, int wait_for_upload);