diff --git a/extra/gap/.SRCINFO b/extra/gap/.SRCINFO
index 8d6c222d5..9e1182ca0 100644
--- a/extra/gap/.SRCINFO
+++ b/extra/gap/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gap
 	pkgdesc = Groups, Algorithms, Programming: a system for computational discrete algebra
 	pkgver = 4.13.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://www.gap-system.org/
 	arch = x86_64
 	license = GPL-2.0-or-later
@@ -24,8 +24,10 @@ pkgbase = gap
 	makedepends = zeromq
 	source = https://github.com/gap-system/gap/releases/download/v4.13.1/gap-4.13.1.tar.gz
 	source = package-infos-4.13.1.json.gz::https://github.com/gap-system/gap/releases/download/v4.13.1/package-infos.json.gz
+	source = https://github.com/gap-system/gap/commit/b6d69e82.patch
 	sha256sums = 9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba
 	sha256sums = 8e6bd0fd2b36f13322ea1e484b5839090b4151d2e24cc7477ad62677bc2a2701
+	sha256sums = f3bc2a2409e7058ab540a765b462f837269f184b02a6e9e6e73c4fb5c523dca4
 
 pkgname = gap
 	depends = glibc
diff --git a/extra/gap/PKGBUILD b/extra/gap/PKGBUILD
index 2cdc255c6..eaa1334cc 100644
--- a/extra/gap/PKGBUILD
+++ b/extra/gap/PKGBUILD
@@ -10,15 +10,17 @@ pkgbase=gap
 pkgname=(gap
          gap-packages)
 pkgver=4.13.1
-pkgrel=2
+pkgrel=3
 pkgdesc='Groups, Algorithms, Programming: a system for computational discrete algebra'
 arch=(x86_64)
 url='https://www.gap-system.org/'
 license=(GPL-2.0-or-later)
 source=(https://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz
-        package-infos-$pkgver.json.gz::https://github.com/gap-system/gap/releases/download/v$pkgver/package-infos.json.gz)
+        package-infos-$pkgver.json.gz::https://github.com/gap-system/gap/releases/download/v$pkgver/package-infos.json.gz
+        https://github.com/gap-system/gap/commit/b6d69e82.patch)
 sha256sums=('9794dbdba6fb998e0a2d0aa8ce21fc8848ad3d3f9cc9993b0b8e20be7e1dbeba'
-            '8e6bd0fd2b36f13322ea1e484b5839090b4151d2e24cc7477ad62677bc2a2701')
+            '8e6bd0fd2b36f13322ea1e484b5839090b4151d2e24cc7477ad62677bc2a2701'
+            'f3bc2a2409e7058ab540a765b462f837269f184b02a6e9e6e73c4fb5c523dca4')
 makedepends=(bliss
              boost
              c-xsc
@@ -47,6 +49,8 @@ prepare() {
 # Fix https://bugs.archlinux.org/task/55174
   sed -e '/xgap/d' -i pkg/sonata/PackageInfo.g
   sed -e '/XGAP/d' -i pkg/cryst/PackageInfo.g
+# Fix some issues in Sagemath
+  patch -p1 -i ../b6d69e82.patch
 # Strip -m32 flags
   sed -e '/-m32/d' -i bin/BuildPackages.sh
 }