diff --git a/NEWS b/NEWS
index 753e18951..19a7a56e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,26 @@
+3.36.4
+======
+* Hide switch-user button on lock screen if unsupported [Chingkai; #2687]
+* Improve world clocks styling [PrOF-kk; #2825]
+* Improve calendar-server performance [Florian, Milan; #1875]
+* Fix regressions in redesigned modal dialogs [Florian, Jonas; #2491, !1336]
+* Better support sandboxed apps with multiple .desktop files [Florian; #219]
+* Fix on-screen keyboard size in portrait orientation [Florian; #2349]
+* Support scrolling anywhere in slider menu items [Peter; #2795]
+* Fixed crash [Marco; #2643]
+* Plugged leaks [Sebastian, Florian; !1306, !1341]
+* Misc. bug fixes and cleanups [Jonas, Daniel, Florian, Sebastian, MOZGIII,
+  Koki; !1119, !1289, !1331, !1192, !1340, !1327, !1279]
+
+Contributors:
+  Marco Trevisan (Treviño), Chingkai, Milan Crha, Jonas Dreßler, Koki Fukuda,
+  Sebastian Keller, MOZGIII, Robert Mader, Florian Müllner, PrOF-kk,
+  Peter Simonyi, Daniel van Vugt
+
+Translators:
+  Matej Urbančič [sl], sicklylife [ja], Fabio Tomat [fur],
+  Baurzhan Muftakhidinov [kk], Daniel Șerbănescu [ro]
+
 3.36.3
 ======
 * Add gnome-shell-extension-prefs wrapper for compatibility [Florian; !1220]
diff --git a/meson.build b/meson.build
index aa09f744f..78e97a87d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-shell', 'c',
-  version: '3.36.3',
+  version: '3.36.4',
   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 4c2ed3c8c..edb649752 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.4" date="2020-07-07"/>
     <release version="3.36.3" date="2020-06-03"/>
     <release version="3.36.2" date="2020-04-29"/>
     <release version="3.36.1" date="2020-03-29"/>
diff --git a/subprojects/extensions-app/meson.build b/subprojects/extensions-app/meson.build
index 6fd056c42..2fa494206 100644
--- a/subprojects/extensions-app/meson.build
+++ b/subprojects/extensions-app/meson.build
@@ -1,5 +1,5 @@
 project('gnome-extensions-app',
-  version: '3.36.3',
+  version: '3.36.4',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/extensions-tool/meson.build b/subprojects/extensions-tool/meson.build
index de2e40749..6602c88d9 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.3',
+  version: '3.36.4',
   meson_version: '>= 0.47.0',
   license: 'GPLv2+'
 )
diff --git a/subprojects/shew/meson.build b/subprojects/shew/meson.build
index 3405df2b7..f5bf2245e 100644
--- a/subprojects/shew/meson.build
+++ b/subprojects/shew/meson.build
@@ -1,5 +1,5 @@
 project('shew', 'c',
-  version: '3.36.3',
+  version: '3.36.4',
   meson_version: '>= 0.47.0',
   license: 'LGPLv2+',
 )