diff --git a/NEWS b/NEWS
index 19a7a56e5..0f2a8ecbf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+3.36.5
+======
+* Fix extension updates when many extensions are installed [Jeremias; !1363]
+* Fix missing icons in on-screen keyboard [Emre; #2631, #3007]
+* Fix delay when showing calendar events [Sebastian; #2992]
+* Fix app picker regressions on small displays [Sebastian; #2234, !1375, !1378]
+* Fix top bar navigation when NumLock is active [Olivier; #550]
+* Delay login animation until wallpaper has loaded [Michael; #734996]
+* Revert changes that caused mispositioning in overview in multi-monitor setups
+  [Robert; #2971]
+* Reset auth prompt on login screen on VT switch before fade in [Ray; #2997]
+* Fix stuck grab when destroying open popup menu [Florian; #3022]
+* Misc. bug fixes and cleanups [Florian, Carlos, Andre, Jonas; !1357, !1371,
+  !1381, #3037, #3005, !1386, !1390]
+
+Contributors:
+  Michael Catanzaro, Jonas Dreßler, Olivier Fourdan, Carlos Garnacho,
+  Sebastian Keller, Robert Mader, Andre Moreira Magalhaes, Florian Müllner,
+  Jeremias Ortega, Ray Strode, Emre Uyguroglu
+
+Translators:
+  Boyuan Yang [zh_CN], Rafael Fontenelle [pt_BR]
+
 3.36.4
 ======
 * Hide switch-user button on lock screen if unsupported [Chingkai; #2687]
diff --git a/meson.build b/meson.build
index 78e97a87d..ef21d54af 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.36.4',
+  version: '3.36.5',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
index edb649752..d1f6a09d0 100644
--- a/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
+++ b/subprojects/extensions-app/data/metainfo/org.gnome.Extensions.metainfo.xml.in
@@ -38,6 +38,7 @@
   </description>
 
   <releases>
+    <release version="3.36.5" date="2020-08-11"/>
     <release version="3.36.4" date="2020-07-07"/>
     <release version="3.36.3" date="2020-06-03"/>
     <release version="3.36.2" date="2020-04-29"/>
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 2fa494206..156f0f0e9 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-app',
-  version: '3.36.4',
+  version: '3.36.5',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build
index 6602c88d9..f3d4ee78b 100644
--- a/subprojects/extensions-tool/meson.build
+++ b/subprojects/extensions-tool/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-tool', 'c',
-  version: '3.36.4',
+  version: '3.36.5',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/shew/meson.build b/subprojects/shew/meson.build
index f5bf2245e..ad564b3ea 100644
--- a/subprojects/shew/meson.build
+++ b/subprojects/shew/meson.build
@@ -1,5 +1,5 @@
 project('shew', 'c',
-  version: '3.36.4',
+  version: '3.36.5',
   meson_version: '>= 0.47.0',
   license: 'LGPLv2+',
 )