diff --git a/package-lock.json b/package-lock.json
index ece17c4..79c028f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "syntaxhighlighter",
-  "version": "3.5.5",
+  "version": "3.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 412b365..e38ce14 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "syntaxhighlighter",
-	"version": "3.5.5",
+	"version": "3.6.0",
 	"description": "Easily post syntax-highlighted code to your WordPress site without having to modify the code at all.",
 	"homepage": "https://alex.blog/wordpress-plugins/syntaxhighlighter/",
 	"author": "Alex Mills (Viper007Bond)",
diff --git a/readme.txt b/readme.txt
index e7f163c..1ce8c49 100644
--- a/readme.txt
+++ b/readme.txt
@@ -2,9 +2,9 @@
 Contributors: Viper007Bond, automattic, donncha
 Donate link: https://alex.blog/2019/03/13/in-memory-of-alex-donation-link-update/
 Tags: code, source, sourcecode, php, syntax highlighting, syntax, highlight, highlighting, highlighter, WordPress.com
-Requires at least: 4.2.3
+Requires at least: 5.2
 Tested up to: 5.6
-Stable tag: 3.5.5
+Stable tag: 3.6.0
 
 Easily post syntax-highlighted code to your site without having to modify the code at all. As seen on WordPress.com.
 
@@ -40,6 +40,22 @@ Try excluding this plugin's Javascript from any performance optimizations your s
 
 == ChangeLog ==
 
+= Version 3.6.0 =
+
+* New: Add ```language shortcut. #180
+* New: Add block alignment support. #179
+* New: Add language selector to block toolbar. #172
+* Fix: Content attribute selector. #178
+* Fix: Escaping for shortcodes and URLs. #177
+* Fix: Escaping issues with HTML entities. #160
+* Fix: MatLab brush key in brush map. #188
+* Fix: Remove <code> wrapper. #163
+* Fix: escaping for non-admin authored posts. #187
+* Tweak: Bump "tested up to" version. #183
+* Tweak: Refactor block JS code. #171
+* Tweak: Update plugin tags. #181
+* Tweak: Use tab size from plugin settings in block editor. #174
+
 = Version 3.5.5 =
 
 * Allow setting text to include br and code tags. #144
diff --git a/syntaxhighlighter.php b/syntaxhighlighter.php
index 283ba49..61c8f18 100644
--- a/syntaxhighlighter.php
+++ b/syntaxhighlighter.php
@@ -4,7 +4,7 @@
 
 Plugin Name:  SyntaxHighlighter Evolved
 Plugin URI:   https://alex.blog/wordpress-plugins/syntaxhighlighter/
-Version:      3.5.5
+Version:      3.6.0-beta.1
 Description:  Easily post syntax-highlighted code to your site without having to modify the code at all. Uses Alex Gorbatchev's <a href="http://alexgorbatchev.com/SyntaxHighlighter/">SyntaxHighlighter</a>. Includes a new editor block.
 Author:       Alex Mills (Viper007Bond)
 Author URI:   https://alex.blog/
@@ -12,14 +12,14 @@
 License:      GPL2
 License URI:  https://www.gnu.org/licenses/gpl-2.0.html
 Requires at least: 5.2
-Tested up to: 5.4
+Tested up to: 5.6
 Requires PHP: 7.0
 
 **************************************************************************/
 
 class SyntaxHighlighter {
 	// All of these variables are private. Filters are provided for things that can be modified.
-	var $pluginver            = '3.5.5';  // Plugin version
+	var $pluginver            = '3.6.0-beta.1';  // Plugin version
 	var $agshver              = false;    // Alex Gorbatchev's SyntaxHighlighter version (dynamically set below due to v2 vs v3)
 	var $shfolder             = false;    // Controls what subfolder to load SyntaxHighlighter from (v2 or v3)
 	var $settings             = array();  // Contains the user's settings