diff --git a/README.md b/README.md
index 7e06bc71..548dcfb4 100644
--- a/README.md
+++ b/README.md
@@ -51,6 +51,9 @@ For support questions, feedback and ideas, please use the [WordPress.org forums]
 
 ## Upgrade Notice
 
+**0.9.7**
+PHP 8 compatible now with various bug fixes
+
 **0.9.6**
 Fix bug around post save, bring Gutenberg to Calendar filters
 
@@ -122,6 +125,19 @@ New features, including story budget and editorial metadata, a completely rewrit
 
 ## Changelog
 
+**0.9.7 (August 26, 2022)**
+* Bug fix: Allow scheduled posts to be shifted around on calendar (https://github.com/Automattic/Edit-Flow/pull/614)
+* Bug fix: Add back unpublish status, small css tweak for statuses (https://github.com/Automattic/Edit-Flow/pull/613)
+* Enhancements: Renaming some frontend calendar configuration variable (https://github.com/Automattic/Edit-Flow/pull/615)
+* Bug fix: Swap join() with implode() for PHP 8 compatibility (https://github.com/Automattic/Edit-Flow/pull/627)
+* Enhancements: Give each attribute in Edit Flow settings page a different id (https://github.com/Automattic/Edit-Flow/pull/650)
+* Bug fix: Fix test_story_budget_set_number_days_filter_invalid in PHP 8.0 (https://github.com/Automattic/Edit-Flow/pull/644)
+* Bug fix: Allow updating post slugs in Quick Edit and Classic Editor with a different status from published (https://github.com/Automattic/Edit-Flow/pull/648)
+* Bug fix: Fix jQuery warnings as WordPress upgraded it from 1.12.4-wp to 3.5.1 (https://github.com/Automattic/Edit-Flow/pull/649)
+* Enhancements: Remove redundant jQuery selector #the-list a.editinline (https://github.com/Automattic/Edit-Flow/pull/668)
+* Enhancements: Remove redundant jQuery selector #toggle_details (https://github.com/Automattic/Edit-Flow/pull/669)
+* Bug fix: Fixes non-variable being passed by reference (https://github.com/Automattic/Edit-Flow/pull/667)
+
 **0.9.6 (April 26, 2020)**
 * Bug fix: Fix bug causing error on save button click for post after hovering over button (https://github.com/Automattic/Edit-Flow/pull/604)
 * Enhancements: Bring Gutenebrg to Calendar filters (https://github.com/Automattic/Edit-Flow/pull/603)
diff --git a/edit_flow.php b/edit_flow.php
index fb9693f2..cfa7ed8a 100644
--- a/edit_flow.php
+++ b/edit_flow.php
@@ -4,7 +4,7 @@
 Plugin URI: http://editflow.org/
 Description: Remixing the WordPress admin for better editorial workflow options.
 Author: Daniel Bachhuber, Scott Bressler, Mohammad Jangda, Automattic, and others
-Version: 0.9.6
+Version: 0.9.7
 Author URI: http://editflow.org/
 
 Copyright 2009-2019 Mohammad Jangda, Daniel Bachhuber, Automattic, et al.
@@ -46,7 +46,7 @@ function _ef_print_php_version_admin_notice() {
 }
 
 // Define contants
-define( 'EDIT_FLOW_VERSION' , '0.9.6' );
+define( 'EDIT_FLOW_VERSION' , '0.9.7' );
 define( 'EDIT_FLOW_ROOT' , dirname(__FILE__) );
 define( 'EDIT_FLOW_FILE_PATH' , EDIT_FLOW_ROOT . '/' . basename(__FILE__) );
 define( 'EDIT_FLOW_URL' , plugins_url( '/', __FILE__ ) );
diff --git a/readme.txt b/readme.txt
index e058aa5e..0c2829a3 100644
--- a/readme.txt
+++ b/readme.txt
@@ -4,8 +4,8 @@ Donate link: http://editflow.org/contribute/
 Tags: edit flow, workflow, editorial, newsroom, management, journalism, post status, custom status, notifications, email, comments, editorial comments, usergroups, calendars, editorial calendar, story budget
 Requires at least: 5.2
 Requires PHP: 5.6
-Tested up to: 5.4
-Stable tag: 0.9.6
+Tested up to: 5.8
+Stable tag: 0.9.7
 
 Redefining your editorial workflow.
 
@@ -57,6 +57,9 @@ For support questions, feedback and ideas, please use the [WordPress.org forums]
 
 == Upgrade Notice ==
 
+= 0.9.7 =
+PHP 8 compatible now with various bug fixes
+
 = 0.9.6 =
 Fix bug around post save, bring Gutenberg to Calendar filters
 
@@ -128,6 +131,19 @@ New features, including story budget and editorial metadata, a completely rewrit
 
 == Changelog ==
 
+= 0.9.7 (Aug 26, 2022) =
+* Bug fix: Allow scheduled posts to be shifted around on calendar (https://github.com/Automattic/Edit-Flow/pull/614)
+* Bug fix: Add back unpublish status, small css tweak for statuses (https://github.com/Automattic/Edit-Flow/pull/613)
+* Enhancements: Renaming some frontend calendar configuration variable (https://github.com/Automattic/Edit-Flow/pull/615)
+* Bug fix: Swap join() with implode() for PHP 8 compatibility (https://github.com/Automattic/Edit-Flow/pull/627)
+* Enhancements: Give each attribute in Edit Flow settings page a different id (https://github.com/Automattic/Edit-Flow/pull/650)
+* Bug fix: Fix test_story_budget_set_number_days_filter_invalid in PHP 8.0 (https://github.com/Automattic/Edit-Flow/pull/644)
+* Bug fix: Allow updating post slugs in Quick Edit and Classic Editor with a different status from published (https://github.com/Automattic/Edit-Flow/pull/648)
+* Bug fix: Fix jQuery warnings as WordPress upgraded it from 1.12.4-wp to 3.5.1 (https://github.com/Automattic/Edit-Flow/pull/649)
+* Enhancements: Remove redundant jQuery selector #the-list a.editinline (https://github.com/Automattic/Edit-Flow/pull/668)
+* Enhancements: Remove redundant jQuery selector #toggle_details (https://github.com/Automattic/Edit-Flow/pull/669)
+* Bug fix: Fixes non-variable being passed by reference (https://github.com/Automattic/Edit-Flow/pull/667)
+
 = 0.9.6 (April 26, 2020) =
 * Bug fix: Fix bug causing error on save button click for post after hovering over button (https://github.com/Automattic/Edit-Flow/pull/604)
 * Enhancements: Bring Gutenebrg to Calendar filters (https://github.com/Automattic/Edit-Flow/pull/603)