diff --git a/SOURCES/config_2711.patch b/SOURCES/config_2711.patch
index 27079a6..b5774b4 100644
--- a/SOURCES/config_2711.patch
+++ b/SOURCES/config_2711.patch
@@ -1,4 +1,4 @@
-From bdec30ca8e18bc7d9a5d25d7cd9ca7976aef8aa2 Mon Sep 17 00:00:00 2001
+From dc00f7eaba06e2abb9cc0c290ccf92a86db413c1 Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
 Date: Mon, 19 May 2025 13:09:29 +0900
 Subject: [PATCH 1/2] Apply config patch for Raspberry Pi (BCM2711)
@@ -7,13 +7,22 @@ The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.
 
 Signed-off-by: Koichiro Iwao <meta@almalinux.org>
 ---
- arch/arm64/configs/bcm2711_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2711_defconfig | 44 ++++++++++++++++++++++++++--
+ 1 file changed, 41 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig
-index ce3e13572fb4..324800576e6a 100644
+index ce3e13572fb4..2fcaa20e8130 100644
 --- a/arch/arm64/configs/bcm2711_defconfig
 +++ b/arch/arm64/configs/bcm2711_defconfig
+@@ -1574,7 +1574,7 @@ CONFIG_JFS_FS=m
+ CONFIG_JFS_POSIX_ACL=y
+ CONFIG_JFS_SECURITY=y
+ CONFIG_JFS_STATISTICS=y
+-CONFIG_XFS_FS=m
++CONFIG_XFS_FS=y
+ CONFIG_XFS_QUOTA=y
+ CONFIG_XFS_POSIX_ACL=y
+ CONFIG_XFS_RT=y
 @@ -1690,8 +1690,6 @@ CONFIG_DLM=m
  CONFIG_UNICODE=m
  CONFIG_KEY_DH_OPERATIONS=y
diff --git a/SOURCES/config_2712.patch b/SOURCES/config_2712.patch
index 29b4459..b7d86a5 100644
--- a/SOURCES/config_2712.patch
+++ b/SOURCES/config_2712.patch
@@ -1,4 +1,4 @@
-From c6064f14a8c32e3109ee83c736097e2ee03086ca Mon Sep 17 00:00:00 2001
+From a8258b9f3f64864c752def95a7867456b868a492 Mon Sep 17 00:00:00 2001
 From: Koichiro Iwao <meta@almalinux.org>
 Date: Mon, 19 May 2025 13:10:35 +0900
 Subject: [PATCH 2/2] Apply config patch for Raspberry Pi (BCM2712)
@@ -7,13 +7,22 @@ The patch is originally provided by Pablo Greco <pgreco@centosproject.org>.
 
 Signed-off-by: Koichiro Iwao <meta@almalinux.org>
 ---
- arch/arm64/configs/bcm2712_defconfig | 42 ++++++++++++++++++++++++++--
- 1 file changed, 40 insertions(+), 2 deletions(-)
+ arch/arm64/configs/bcm2712_defconfig | 44 ++++++++++++++++++++++++++--
+ 1 file changed, 41 insertions(+), 3 deletions(-)
 
 diff --git a/arch/arm64/configs/bcm2712_defconfig b/arch/arm64/configs/bcm2712_defconfig
-index 9e2bda050f81..51afa99f75e3 100644
+index 9e2bda050f81..a107409b347b 100644
 --- a/arch/arm64/configs/bcm2712_defconfig
 +++ b/arch/arm64/configs/bcm2712_defconfig
+@@ -1576,7 +1576,7 @@ CONFIG_JFS_FS=m
+ CONFIG_JFS_POSIX_ACL=y
+ CONFIG_JFS_SECURITY=y
+ CONFIG_JFS_STATISTICS=y
+-CONFIG_XFS_FS=m
++CONFIG_XFS_FS=y
+ CONFIG_XFS_QUOTA=y
+ CONFIG_XFS_POSIX_ACL=y
+ CONFIG_XFS_RT=y
 @@ -1692,8 +1692,6 @@ CONFIG_DLM=m
  CONFIG_UNICODE=m
  CONFIG_KEY_DH_OPERATIONS=y
diff --git a/SPECS/raspberrypi2.spec b/SPECS/raspberrypi2.spec
index 3e033b7..2651c29 100644
--- a/SPECS/raspberrypi2.spec
+++ b/SPECS/raspberrypi2.spec
@@ -11,7 +11,7 @@ ExclusiveArch: aarch64
 
 %define local_version v8
 %define bcmmodel 2711
-%define extra_version 1
+%define extra_version 2
 
 # This originally implies Kernel 4.x for RPi 2 and is not appropriate now.
 # Be careful to change this not to disturb the seamless package update.
@@ -504,6 +504,9 @@ cp $(ls -1 /boot/config-kernel-*-*|sort -V|tail -1) /boot/config-kernel.inc
 %endif
 
 %changelog
+* Mon Jun 23 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.25-20250428.v8.2
+- Switch XFS support from module (m) to built-in (y) for rootfs boot
+
 * Mon May 26 2025 Koichiro Iwao <meta@almalinux.org> - 6.12.25-20250428.v8.1
 - Update kernel to v6.12.25 stable_20250428
 - Update firmware to 1.20250430