diff --git a/libgap/README b/libgap/README
index 67cc8d50c..a8b4ca44a 100644
--- a/libgap/README
+++ b/libgap/README
@@ -1,25 +1,24 @@
 libgap
 ------------------------------------------
-LibGAP is essentially a fork of the upstream GAP kernel. It is developed in
-its own repository at https://bitbucket.org/vbraun/libgap. This is also where
-the spkg metadata is tracked.
+LibGAP is essentially a fork of the upstream GAP kernel. It is developed in its
+own repository at https://bitbucket.org/vbraun/libgap. This is also where the
+spkg metadata is tracked.
 
 Runtime requirements:
-  cygwin-2.9.0-3
-  libgap-devel-4.8.6-1bl1
-  libgap4-4.8.6-1bl1
-  pkg-config-0.29.1-1
+  cygwin-3.5.6-1
+  libgap-devel-4.8.6-1bl2
+  libgap4-4.8.6-1bl2
+  pkg-config-2.3.0-1
 
 Build requirements:
 (besides corresponding -devel packages)
-  autoconf-13-1
-  automake-10-1
-  binutils-2.28-3
-  cygport-0.24.1-1
-  gcc-core-6.4.0-1
-  libtool-2.4.6-5
-  make-4.2.1-2
-  python-2.7.13-1
+  autoconf-15-2
+  automake-20240607-1
+  binutils-2.43.1-1
+  cygport-0.36.9-1
+  gcc-core-12.4.0-3
+  libtool-2.5.4-1
+  make-4.4.1-2
 
 Canonical website:
   https://bitbucket.org/vbraun/libgap
@@ -135,6 +134,9 @@ Files included in the binary package:
 
 Port Notes:
 
+----- version 4.8.6-1bl2 -----
+Rebuild with gcc-12.4.0
+
 ----- version 4.8.6-1bl1 -----
 Version bump.
 
diff --git a/libgap/libgap-4.8.6-1bl1.cygport b/libgap/libgap-4.8.6-1bl2.cygport
similarity index 75%
rename from libgap/libgap-4.8.6-1bl1.cygport
rename to libgap/libgap-4.8.6-1bl2.cygport
index 369f0ead7..f0253567d 100644
--- a/libgap/libgap-4.8.6-1bl1.cygport
+++ b/libgap/libgap-4.8.6-1bl2.cygport
@@ -1,5 +1,8 @@
 HOMEPAGE="https://bitbucket.org/vbraun/${PN}"
 SRC_URI="http://files.sagemath.org/spkg/upstream/${PN}/${P}.tar.gz"
+PATCH_URI="
+	https://src.fedoraproject.org/rpms/${PN}/raw/f29/f/libgap-stat.patch
+"
 
 CATEGORY="Libs"
 SUMMARY="C library version of the GAP kernel"
@@ -7,6 +10,10 @@ DESCRIPTION="LibGAP is essentially a fork of the upstream GAP kernel. It is deve
 its own repository at https://bitbucket.org/vbraun/libgap. This is also where
 the spkg metadata is tracked."
 
+LICENSE="GPL-2.0-or-later"
+LICENSE_SPDX="SPDX-License-Identifier: GPL-2.0-or-later"
+LICENSE_URI="COPYING"
+
 PKG_NAMES="
 	${PN}
 	${PN}4
@@ -16,7 +23,7 @@ libgap_CONTENTS="
 	usr/share
 "
 libgap4_CONTENTS="
-	usr/bin
+	usr/bin/cyg*-4.dll
 "
 libgap_devel_CONTENTS="
 	usr/include
diff --git a/libgap/libgap-4.8.6-1bl1.src.patch b/libgap/libgap-4.8.6-1bl2.src.patch
similarity index 80%
rename from libgap/libgap-4.8.6-1bl1.src.patch
rename to libgap/libgap-4.8.6-1bl2.src.patch
index f6056ba81..21a6bd56c 100644
--- a/libgap/libgap-4.8.6-1bl1.src.patch
+++ b/libgap/libgap-4.8.6-1bl2.src.patch
@@ -1,5 +1,5 @@
 --- origsrc/libgap-4.8.6/Makefile.am	2017-01-23 07:47:12.000000000 +0900
-+++ src/libgap-4.8.6/Makefile.am	2017-10-05 09:47:52.836080500 +0900
++++ src/libgap-4.8.6/Makefile.am	2025-01-27 08:02:54.869581300 +0900
 @@ -12,3 +12,6 @@ ACLOCAL_AMFLAGS = -I m4
  SUBDIRS = src test
  
@@ -8,7 +8,7 @@
 +pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfig_DATA = $(PACKAGE).pc
 --- origsrc/libgap-4.8.6/configure.ac	2017-01-23 08:12:26.000000000 +0900
-+++ src/libgap-4.8.6/configure.ac	2017-10-05 09:47:52.851695800 +0900
++++ src/libgap-4.8.6/configure.ac	2025-01-27 08:02:54.869581300 +0900
 @@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
  AC_CONFIG_SRCDIR([src/gap.h])
  AC_CONFIG_HEADERS([src/config.h])
@@ -19,7 +19,7 @@
    src/Makefile
    test/Makefile
 --- origsrc/libgap-4.8.6/libgap.pc.in	1970-01-01 09:00:00.000000000 +0900
-+++ src/libgap-4.8.6/libgap.pc.in	2017-10-05 09:54:50.674000000 +0900
++++ src/libgap-4.8.6/libgap.pc.in	2025-01-27 08:02:54.869581300 +0900
 @@ -0,0 +1,10 @@
 +prefix=@prefix@
 +exec_prefix=@exec_prefix@
@@ -32,7 +32,7 @@
 +Libs: -L${libdir} -lgap
 +Cflags: -I${includedir}/gap
 --- origsrc/libgap-4.8.6/src/Makefile.am	2017-01-23 07:47:12.000000000 +0900
-+++ src/libgap-4.8.6/src/Makefile.am	2017-10-05 09:43:12.961000000 +0900
++++ src/libgap-4.8.6/src/Makefile.am	2025-01-27 08:02:54.869581300 +0900
 @@ -1,4 +1,4 @@
 -DEFAULT_INCLUDES = -I@top_builddir@
 +DEFAULT_INCLUDES = -I$(top_builddir) -I$(top_builddir)/src
@@ -40,7 +40,7 @@
  lib_LTLIBRARIES = libgap.la
  
 --- origsrc/libgap-4.8.6/test/Makefile.am	2017-01-23 07:47:12.000000000 +0900
-+++ src/libgap-4.8.6/test/Makefile.am	2017-10-05 09:46:02.844000200 +0900
++++ src/libgap-4.8.6/test/Makefile.am	2025-01-27 08:02:54.869581300 +0900
 @@ -1,4 +1,4 @@
 -DEFAULT_INCLUDES = -I@top_srcdir@ -I@top_builddir@
 +DEFAULT_INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/src