diff --git a/.abignore b/.abignore
deleted file mode 100644
index 7cd584b..0000000
--- a/.abignore
+++ /dev/null
@@ -1,31 +0,0 @@
-[suppress_function]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_function]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_PRIVATE.*
-soname_regexp = libvirt\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = LIBVIRT_ADMIN_PRIVATE.*
-soname_regexp = libvirt-admin\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_storage_.*\\.so.*
-
-[suppress_function]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
-
-[suppress_variable]
-symbol_version_regexp = .*
-soname_regexp = libvirt_driver_.*\\.so.*
diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/gating.yaml b/gating.yaml
deleted file mode 100644
index fa93037..0000000
--- a/gating.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-# recipients: libvirt-qe
---- !Policy
-product_versions:
-  - rhel-10
-decision_context: osci_compose_gate
-subject_type: brew-build
-rules:
-  - !PassingTestCaseRule {test_case_name: libvirt-ci.libvirt.brew-build.gating.x86_64.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: libvirt-ci.libvirt-python.brew-build.gating.x86_64.tier1.functional}
-  - !PassingTestCaseRule {test_case_name: libvirt-ci.libvirt.brew-build.gating.s390x.tier1.functional}
diff --git a/libvirt.spec b/libvirt.spec
index daf7746..8af02b9 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -298,7 +298,7 @@
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 12.2.0
+Version: 12.4.0
 Release: 1%{?dist}%{?extra_release}.alma.1
 License: GPL-2.0-or-later AND LGPL-2.1-only AND LGPL-2.1-or-later AND OFL-1.1
 URL: https://libvirt.org/
@@ -2263,6 +2263,8 @@ exit 0
 %{_unitdir}/virtsecretd.socket
 %{_unitdir}/virtsecretd-ro.socket
 %{_unitdir}/virtsecretd-admin.socket
+%dir %attr(0755, root, root) %{_unitdir}/libvirtd.service.d/
+%{_unitdir}/libvirtd.service.d/10-secret.conf
 %attr(0755, root, root) %{_sbindir}/virtsecretd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/secrets/
@@ -2703,9 +2705,18 @@ exit 0
 %endif
 
 %changelog
-* Sat Jun 06 2026 Eduard Abdullin <eabdullin@almalinux.org> - 12.2.0-1.alma.1
+* Tue Jun 16 2026 Eduard Abdullin <eabdullin@almalinux.org> - 12.4.0-1.alma.1
 - Enable building for ppc64le
 
+* Mon Jun 15 2026 Jiri Denemark <jdenemar@redhat.com> - 12.4.0-1
+- Rebased to libvirt-12.4.0 (RHEL-156861)
+- The rebase also fixes the following bugs:
+    RHEL-76301, RHEL-114415, RHEL-118303, RHEL-145306, RHEL-145937
+    RHEL-147660, RHEL-147661, RHEL-148219, RHEL-150883, RHEL-153832
+    RHEL-154252, RHEL-154292, RHEL-154549, RHEL-155804, RHEL-155809
+    RHEL-156689, RHEL-156800, RHEL-156804, RHEL-159134, RHEL-164023
+    RHEL-169588, RHEL-170773, RHEL-170993, RHEL-174300, RHEL-176438
+
 * Fri Apr 10 2026 Jiri Denemark <jdenemar@redhat.com> - 12.2.0-1
 - Rebased to libvirt-12.2.0 (RHEL-156861)
 - The rebase also fixes the following bugs:
diff --git a/plans.fmf b/plans.fmf
new file mode 100644
index 0000000..ca480d9
--- /dev/null
+++ b/plans.fmf
@@ -0,0 +1,9 @@
+/gating:
+    plan:
+        import:
+            url: https://gitlab.com/redhat/rhel/tests/libvirt
+            name: /plans/gating
+
+adjust:
+    enabled: false
+    when: distro != rhel
diff --git a/sources b/sources
index 56e7562..a087a38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (libvirt-12.2.0.tar.xz) = ce3f877da86eeceebcc7a4f857a1be97fe18883ff0e2ae1bac774dd034105762be521b70905a048c5335163ba2a829a4385521df44541190149be0c5b5b645e0
+SHA512 (libvirt-12.4.0.tar.xz) = df24d57df98cc98b75fd6b8e25fb22e69629431cbf26680f22297f70af1c5775484903777a6ec82d9b45ebcf0a88d4d71b8ce16ab1cf5387f498cd8b605988ca