diff --git a/changelog.txt b/changelog.txt
index 03c8a71a4a1..46c38a73c8e 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,78 @@
 == Changelog ==
 
+= 5.8.0 2021-10-12 =
+
+**WooCommerce**
+
+* Add - `modified_before` and `modified_after` filtering parameters to REST API for products, orders and coupons. #30585
+* Add - `woocommerce_quantity_input_min_admin` and `woocommerce_quantity_input_step_admin` filters. #30705
+* Dev - Action Scheduler updated to 3.3.0. #30719
+* Dev - Add order argument to `woocommerce_order_actions` filter. #30475
+* Fix - During product quick edit, the featured setting is sometimes not shown correctly as checked. #30639
+* Fix - Offsets not calculated correctly sometimes on select2 dropdowns causing usability issues. #30690
+* Fix - Select2 dropdown search input not getting focus when select2 dropdown element gets focused. #30626
+* Tweak - Add individual item remove notices based on the context of the line item in the order. #30650
+* Tweak - Change the shop page summary which was not relevant to the public. #30573
+* Tweak - Deleted unneeded double spaces in text strings. #30487
+* Tweak - Open Browse all extensions link in a new tab. #30640
+
+** WooCommerce Admin - 2.7.1 & 2.7.2**
+
+* Fix - Fix analytics crashing on daylight saving. #7763
+* Fix - Allow super admins all capabilities within WooCommerce Admin. #7489
+* Fix - Fix end date for last periods. #6584
+* Fix - Fix up onboarding profiler not working when opted out of tracking. #7490
+* Fix - Making Business Details sticky in onboarding wizard. #7426
+* Fix - Missing RTL for onboarding styles. #7531
+* Fix - Skip scheduling action if Action Scheduler tables have not been set up. #7521
+* Fix - Update country region typeahead for better autofill support. #7497
+* Fix - Use installable extensions for local state versus free extensions. #7585
+* Fix - Fix fatal error and unrelated results in analytics. #7682
+* Fix - Harden the reports directory. #7691
+* Fix - Update task-item logic to only display content when expanded is true. #7611
+* Add - Show Pinterest in installed marketing extensions (if installed). #7417
+* Add - Added MailchimpScheduler that runs daily to subscribe store_email in the profile data. #7579
+* Add - Added shipping plugin recommendations to settings page. #7446
+* Add - Adding endpoint to snooze onboarding task. #7539
+* Add - Adding undo snooze task endpoint. #7560
+* Add - Add task dismissal endpoints. #7538
+* Update - Add HK and SG countries to WC Pay intl support. #7558
+* Update - Create task list REST API endpoint. #7512
+* Update - Deleted OnboardingEmailMarketing note class. #7595
+* Update - Removes the use of the depreciated woocommerce_shared_settings hook. #7480
+* Update - Removes non WooCommerce Admin specific settings from the `wc_admin` namespace in the `wc/data` settings store (ex: countries). #7480
+* Update - Updating eway logo in payment suggestions defaults. #7562
+* Update - Update marketing task completion logic. #7586
+* Dev - Add email address field to OBW. #7552
+* Tweak - Add navigation items for the Marketplace menu. #7529
+* Tweak - Change all analytics strings and labels to sentence case. #6501
+* Tweak - Delete unneeded double spaces in text strings. #7502
+* Tweak - Remove the preloaded onboarding options. #7338
+* Tweak - Update analytics card header text styles. #6506
+* Enhancement - Align Table fields with the fallback on isNumeric. #7431
+
+**WooCommerce Blocks - 5.7.1 & 5.8.0 & 5.9.0 & 5.9.1**
+
+* Add - Extensibility point for extensions to filter payment methods. #4668
+* Add - "Filter Products by Stock" block. #4145
+* Add - Introduced the `__experimental_woocommerce_blocks_checkout_update_order_from_request` hook to the Checkout Store API. #4610.
+* Fix - Add label element to `<BlockTitle>` component. #4585
+* Fix - Disable Cart, Checkout, All Products & filters blocks from the widgets screen.
+* Fix - Infinite recursion when removing an attribute filter from the Active filters block. #4816
+* Fix - Prevent Product Category List from displaying incorrectly when used on the shop page. #4587
+* Fix - Product Search block displaying incorrectly. #4740
+* Tweak - Add Extensibility info to Store API readme. #4605
+* Tweak - Update documentation for the snackbarNoticeVisibility filter. #4508
+* Tweak - Add documentation for `extensionCartUpdate` method - this allows extensions to update the client-side cart after it has been modified on the server. #4377
+
+**Action Scheduler 3.3.0**
+
+* Enhancement - Adds as_has_scheduled_action() to provide a performant way to test for existing actions. #645
+* Dev - Now supports queries that use multiple statuses. #649
+* Dev - Minimum requirements for WordPress and PHP bumped (to 5.2 and 5.6 respectively). #723
+* Fix - Improves compatibility with environments where NO_ZERO_DATE is enabled. #519
+* Fix - Adds safety checks to guard against errors when our database tables cannot be created. #645
+
 = 5.7.1 2021-09-23 =
 
 **WooCommerce**
diff --git a/readme.txt b/readme.txt
index 1b35b9fd4a4..a995f259580 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,7 @@ Tags: e-commerce, store, sales, sell, woo, shop, cart, checkout, downloadable, d
 Requires at least: 5.6
 Tested up to: 5.8
 Requires PHP: 7.0
-Stable tag: 5.7.1
+Stable tag: 5.8.0
 License: GPLv3
 License URI: https://www.gnu.org/licenses/gpl-3.0.html