diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a5ede7..189abcf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 All changes to the project will be documented in this file.
 
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link iusses/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
+
 ### 4.35.3 - 14 Jan 2021
 - Fix a bug that Wiki page cannot be deleted
 - Fix a deployment issue on Tomcat
diff --git a/README.md b/README.md
index 667b44a..17565b8 100644
--- a/README.md
+++ b/README.md
@@ -61,31 +61,12 @@
 - If you can't find same question and report, send it to our [Gitter room](https://gitter.im/gitbucket/gitbucket) before raising an issue.
 - The highest priority of GitBucket is the ease of installation and API compatibility with GitHub, so your feature request might be rejected if they go against those principles.
 
-What's New in 4.35.x
+What's New in 4.36.x
 -------------
-### 4.35.3 - 14 Jan 2021
-- Fix a bug that Wiki page cannot be deleted
-- Fix a deployment issue on Tomcat
-
-### 4.35.2 - 30 Dec 2020
-- Upgrade gitbucket-notifications-plugin to 1.10.0
-- Upgrade oauth2-oidc-sdk to 8.29.1 to solve dependency issue
-
-### 4.35.1 - 29 Dec 2020
-
-- Fix database migration issue which happens if webhook is configured
-- Call push webhook when pull request is merged
-- Show commit status at commits tab of pull request
-
-### 4.35.0 - 25 Dec 2020
-
-- Editor and source viewer color theme
-- Auto completion for issues and pull requests
-- Upload image from clipboard
-- Close multiple issues by commit comment
-- Create pull request from online editor
-- Milestone overview
-- Commit status at various places
-- WebAPI coverage improvements
+### 4.36.0 - 17 Jul 2021
+- Tag selector in the repository viewer
+- Link iusses/pull requests of other repositories
+- Files and lines can be linked in the diff view
+- Option to disable XSS protection
 
 See the [change log](CHANGELOG.md) for all of the updates.
diff --git a/build.sbt b/build.sbt
index 0add426..77d703e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -3,7 +3,7 @@
 
 val Organization = "io.github.gitbucket"
 val Name = "gitbucket"
-val GitBucketVersion = "4.35.3"
+val GitBucketVersion = "4.36.0"
 val ScalatraVersion = "2.7.1"
 val JettyVersion = "9.4.43.v20210629"
 val JgitVersion = "5.12.0.202106070339-r"