diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9215f67bc..6e6c024cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.36.2 / 2022-06-20
+
+* [BUGFIX] Fix serving of static assets like fonts and favicon. #10888
+
 ## 2.36.1 / 2022-06-09
 
 * [BUGFIX] promtool: Add --lint-fatal option #10840
diff --git a/VERSION b/VERSION
index 089d1d4e0..38bcf609c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.36.1
+2.36.2