diff --git a/.github/ISSUE_TEMPLATE/01-bug-report.yml b/.github/ISSUE_TEMPLATE/01-bug-report.yml
index 890e9568e..2f9159f78 100644
--- a/.github/ISSUE_TEMPLATE/01-bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/01-bug-report.yml
@@ -14,8 +14,7 @@ body:
     attributes:
       label: Select the version
       options:
-        - 25.0.0.0
-        - 25.0.0.1
+        - 25.0.0.X
         - Git master branch
         - other or don't know
       default: 1
diff --git a/.github/scripts/compile-drivers.sh b/.github/scripts/compile-drivers.sh
index 7145042d3..a68076e38 100755
--- a/.github/scripts/compile-drivers.sh
+++ b/.github/scripts/compile-drivers.sh
@@ -14,6 +14,7 @@ cd $DRV_BUILD_DIR
 build_drv_ac xf86-input-elographics $X11L_DRV_GIT/xf86-input-elographics master
 build_drv_ac xf86-input-evdev       $X11L_DRV_GIT/xf86-input-evdev       master
 build_drv_ac xf86-input-libinput    $X11L_DRV_GIT/xf86-input-libinput    master
+build_drv_ac xf86-input-mouse       $X11L_DRV_GIT/xf86-input-mouse       master
 build_drv_ac xf86-input-synaptics   $X11L_DRV_GIT/xf86-input-synaptics   master
 
 build_drv_ac xf86-video-amdgpu      $X11L_DRV_GIT/xf86-video-amdgpu      xf86-video-amdgpu-23.0.0
diff --git a/.github/workflows/build-xserver.yml b/.github/workflows/build-xserver.yml
index 417db1bfd..d86ebb379 100644
--- a/.github/workflows/build-xserver.yml
+++ b/.github/workflows/build-xserver.yml
@@ -1,5 +1,8 @@
 name: Build X servers
 
+permissions:
+    contents: read
+
 env:
     MESON_BUILDDIR:  "build"
     X11_PREFIX:      /home/runner/x11
diff --git a/hw/xnest/Screen.c b/hw/xnest/Screen.c
index c38a538a3..df5e8f984 100644
--- a/hw/xnest/Screen.c
+++ b/hw/xnest/Screen.c
@@ -163,10 +163,11 @@ static void add_depth_visual(DepthPtr depths, int *numDepths, int nplanes, Visua
 Bool
 xnestOpenScreen(ScreenPtr pScreen, int argc, char *argv[])
 {
-    unsigned long valuemask;
-    VisualID defaultVisual = 0;
-    int rootDepth = 0;
-    miPointerScreenPtr PointPriv;
+  
+  unsigned long valuemask;
+  VisualID defaultVisual = 0;
+  int rootDepth = 0;
+  miPointerScreenPtr PointPriv;
 
     if (!dixRegisterPrivateKey
         (&xnestWindowPrivateKeyRec, PRIVATE_WINDOW, sizeof(xnestPrivWin)))
diff --git a/meson.build b/meson.build
index 2a5500635..433bfaf8a 100644
--- a/meson.build
+++ b/meson.build
@@ -3,10 +3,10 @@ project('xserver', 'c',
             'buildtype=debugoptimized',
             'c_std=gnu99',
         ],
-        version: '25.0.0.1',
+        version: '25.0.0.2',
         meson_version: '>= 0.58.0',
 )
-release_date = '2025-06-21'
+release_date = '2025-06-30'
 
 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc'])
 cc = meson.get_compiler('c')