diff --git a/.cockpit.metadata b/.cockpit.metadata
index a9fd815..ac0c006 100644
--- a/.cockpit.metadata
+++ b/.cockpit.metadata
@@ -1 +1 @@
-15083f0a197c5772b1ebc2b2cdfdc120c404e36f SOURCES/cockpit-311.1.tar.xz
+c24d50c29aef687b03f60888cbfd983040c195d7  SOURCES/cockpit-311.2.tar.xz
diff --git a/.gitignore b/.gitignore
index 27f5e5e..ed6fb26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/cockpit-311.1.tar.xz
+SOURCES/cockpit-311.2.tar.xz
diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec
index 46d5b0d..428143c 100644
--- a/SPECS/cockpit.spec
+++ b/SPECS/cockpit.spec
@@ -49,8 +49,8 @@ Summary:        Web Console for Linux servers
 License:        LGPL-2.1-or-later
 URL:            https://cockpit-project.org/
 
-Version:        311.1
-Release:        1%{?dist}.inferit.1
+Version:        311.2
+Release:        2%{?dist}.inferit
 # We need to patch official source (000* patches in SOURCE) and
 # repack tarball to recompile javascript.
 # Use script cockpit-inferit-patch.sh <version> to create
@@ -711,7 +711,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
-* Tue May 14 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 311.1-1.inferit.1
+* Tue Apr 02 2024 Martin Pitt <mpitt@redhat.com> - 311.2-1
+- sosreport: Fix command injection with crafted report names [CVE-2024-2947]
+  (jira#RHEL-31074)
+
+* Mon Apr  1 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 311.1-1.inferit.1
 - Change chpasswd to passwd to support PAM crypto algorithms
 - Update Russian translation
 - Added support GOST and PAM-GOST profiles for crypto-policies in the UI interface
@@ -756,17 +760,62 @@ via PackageKit.
 - bridge: Add back menu/tool names to cockpit-bridge --packages (RHEL-19004)
 - bridge: Add back support for x.min.js files (RHEL-19005)
 
-* Wed Sep 27 2023 Martin Pitt <mpitt@redhat.com> - 300.3-1
-- Fix crash with large file uploads (RHEL-5341)
-- Fix connecting to older bridges, in particular RHEL 8 (RHEL-3537)
+* Tue Feb 20 2024 Packit <hello@packit.dev> - 311.1-1
+- Update documentation links to RHEL 9 (RHEL-3954)
+- Storage: Various bug fixes
+
+* Wed Feb 14 2024 Packit <hello@packit.dev> - 311-1
+- Bug fixes and stability improvements
+
+* Wed Feb 07 2024 Packit <hello@packit.dev> - 310.2-1
+- selinux: Cover migration to /run
+- ws: Handle HEAD requests correctly, for curl 8.6.0
+
+* Fri Feb 02 2024 Packit <hello@packit.dev> - 310.1-1
+- bridge: Fix race condition/crash in file watching channels
+
+* Wed Jan 31 2024 Packit <hello@packit.dev> - 310-1
+- Storage: support for btrfs
+- Storage: improved support for swap
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 309-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 309-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jan 18 2024 Packit <hello@packit.dev> - 309-1
+- Storage: Introduce btrfs support
+
+* Wed Jan 03 2024 Packit <hello@packit.dev> - 308-1
+- Fix connecting to remote hosts with OpenSSH 0.9.6
+
+* Fri Dec 15 2023 Martin Pitt <mpitt@redhat.com> - 307-1
+- Storage redesign
+
+* Wed Nov 29 2023 Packit <hello@packit.dev> - 306-1
+- Kdump: Add Ansible/shell automation
+
+* Wed Nov 15 2023 Packit <hello@packit.dev> - 305-1
+- Performance and stability improvements
+
+* Wed Nov 01 2023 Packit <hello@packit.dev> - 304-1
+Storage: Support for RAID layouts with LVM2
+
+* Thu Oct 19 2023 Adam Williamson <awilliam@redhat.com> - 303-2
+- Rebuild for untagged selinux-policy (cockpit-ws dep)
+
+* Wed Oct 18 2023 Packit <hello@packit.dev> - 303-1
+- Apps: Warn if appstream data package is missing
+- Shell: Redesign untrusted "add host" dialog
 
-* Thu Sep 21 2023 Martin Pitt <mpitt@redhat.com> - 300.2-1
-- Keep administrative access after a page reload (RHEL-5765)
-- spec: Move to BuildRequires: python3-devel (RHEL-2215)
-- Lots of test stabilizations
+* Thu Oct 05 2023 Packit <hello@packit.dev> - 302-1
+- Storage: Partitions can be resized
+- many bug fixes
 
-* Thu Sep 07 2023 Martin Pitt <mpitt@redhat.com> - 300.1-1
-- Translation updates (rhbz#2189499)
+* Wed Sep 20 2023 Packit <hello@packit.dev> - 301-1
+- WireGuard support
+- Metrics: link to network interface details
 
 * Wed Sep 06 2023 Packit <hello@packit.dev> - 300-1
 - Celebrating the Nürnberg life release!