diff --git a/community/gap/PKGBUILD b/community/gap/PKGBUILD
index 5d86ead67..ecbb01a7d 100644
--- a/community/gap/PKGBUILD
+++ b/community/gap/PKGBUILD
@@ -8,29 +8,21 @@
 
 pkgbase=gap
 pkgname=(gap gap-packages)
-pkgver=4.12.0
-pkgrel=5
+pkgver=4.12.1
+pkgrel=1
 pkgdesc='Groups, Algorithms, Programming: a system for computational discrete algebra'
 arch=(x86_64)
 url='https://www.gap-system.org/'
 license=(GPL)
 source=(https://github.com/gap-system/gap/releases/download/v$pkgver/$pkgbase-$pkgver.tar.gz
-        https://github.com/gap-system/gap/releases/download/v$pkgver/package-infos.json.gz
-        https://github.com/gap-system/gap/commit/dce6fa96.patch
-        https://github.com/gap-system/gap/commit/c57a07a3.patch)
-sha256sums=('6005d0c0316fe8803d84681f30be64eace83a9542f975f5cb3dedfadd4391849'
-            'abca41d8ec8341d39df99291136c465217fb14f9029cbbdd6378bc37499eac7c'
-            'd8a362a6c1d27f2925d8b3f8eddc9aaafac1699fb568a035768d039b34ba6eb3'
-            '6a66c31eada7a0da5f6c716a8f7ea90dceb2d41c8ad97af2e7d5b1415dbe210a')
+        package-infos-$pkgver.json.gz::https://github.com/gap-system/gap/releases/download/v$pkgver/package-infos.json.gz)
+sha256sums=('f9ebef11ee31b210ce36e3c70960742b4e253282bbd5270adc9324273c92b016'
+            '72c4c931d5ed1b2cdeea5c5c65800cf1f510e79284f7d27228c9e52326b4b239')
 makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll wget chrpath fmt eigen normaliz jq)
 
 prepare() {
   cd gap-$pkgver
 
-# Fix including headers when no garbage collector is specified
-  patch -p1 < ../dce6fa96.patch
-# Fix make install trying to install non-existant docs
-  patch -p1 < ../c57a07a3.patch
 # Use system libsemigroups
   sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i pkg/semigroups/configure
 # Use system normaliz
@@ -81,7 +73,7 @@ package_gap() {
 
 # Add provides for bundled packages
   for _pkg in $(ls "$pkgdir"/usr/share/gap/pkg); do
-    _ver=$(jq .[\"${_pkg}\"].Version "$srcdir"/package-infos.json | sed -e 's/"//g')
+    _ver=$(jq .[\"${_pkg}\"].Version "$srcdir"/package-infos-$pkgver.json | sed -e 's/"//g')
     _prov="gap-$_pkg=${_ver/-/.}"
     provides+=($_prov)
   done
@@ -128,7 +120,7 @@ package_gap-packages() {
 
 # Add provides for bundled packages
   for _pkg in $(ls "$pkgdir"/usr/lib/gap/pkg); do
-    _ver=$(jq .[\"${_pkg}\"].Version "$srcdir"/package-infos.json | sed -e 's/"//g')
+    _ver=$(jq .[\"${_pkg}\"].Version "$srcdir"/package-infos-$pkgver.json | sed -e 's/"//g')
     _prov="gap-$_pkg=${_ver/-/.}"
     provides+=($_prov)
   done