diff --git a/community/gap/PKGBUILD b/community/gap/PKGBUILD
index 274438e5a..62872ac37 100644
--- a/community/gap/PKGBUILD
+++ b/community/gap/PKGBUILD
@@ -8,19 +8,17 @@
 pkgbase=gap
 pkgname=(gap gap-doc gap-packages)
 pkgver=4.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Groups, Algorithms, Programming: a system for computational discrete algebra"
 arch=(x86_64)
 url="https://www.gap-system.org/"
 license=(GPL)
-source=("https://www.gap-system.org/pub/gap/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz" gap.sh
+source=("https://files.gap-system.org/gap-${pkgver%.*}/tar.gz/gap-$pkgver.tar.gz" gap.sh
          git+https://github.com/gap-packages/NormalizInterface#commit=cd69a42
-         normalizinterface-missing-include.patch
          gap-polymake-4.0.patch)
 sha256sums=('6fda7af23394708aeb3b4bca8885f5fdcb7c3ae4419639dfb2d9f67d3f590abb'
             '143fb8a79a52c007903cce13407850df309ef803a9b00398d05169355917de46'
             'SKIP'
-            '2410dfc69f1f4d2f320e91590d55e59c7b557637f9f60b9e609b318cfc21c181'
             'e3f6d671c8df9acb6143a7c279391957967cd44f0a00b949323401d5b54ed685')
 makedepends=(libxaw givaro mpfi normaliz polymake boost libsemigroups c-xsc zeromq fplll wget chrpath fmt git)
 
@@ -31,8 +29,6 @@ prepare() {
   sed -e '/build-normaliz.sh/d' -i bin/BuildPackages.sh
 # Use system libsemigroups
   sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i pkg/semigroups-*/configure
-# Disable anupq package, it's i686 only
-  rm -r pkg/anupq-*
 # 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
@@ -40,10 +36,8 @@ prepare() {
 # Update NormalizInterface to support recent normaliz
   rm -r pkg/NormalizInterface-1.1.0
   cp -r ../NormalizInterface pkg
-  cd pkg/NormalizInterface
-  patch -p1 -i "$srcdir"/normalizinterface-missing-include.patch
 
-  cd ../PolymakeInterface-*
+  cd pkg/PolymakeInterface-*
   patch -p2 -i "$srcdir"/gap-polymake-4.0.patch # Fix build with polymake 4.0
 }
 
@@ -122,7 +116,7 @@ package_gap-packages() {
   cp -r pkg "$pkgdir"/usr/lib/gap
 
 # fix xgap launch script
-  sed -e 's|/build/gap/src/gap-4.10.2|/usr/lib/gap|g' -e 's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \
+  sed -e "s|/build/gap/src/gap-$pkgver|/usr/lib/gap|g" -e 's|^GAP=.*|GAP=/usr/lib/gap/gap|g' \
     "$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh > "$pkgdir"/usr/bin/xgap
   chmod 755 "$pkgdir"/usr/bin/xgap
   rm "$pkgdir"/usr/lib/gap/pkg/xgap-*/xgap.sh*
diff --git a/community/gap/normalizinterface-missing-include.patch b/community/gap/normalizinterface-missing-include.patch
deleted file mode 100644
index 31567baa7..000000000
--- a/community/gap/normalizinterface-missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/normaliz.cc b/src/normaliz.cc
-index a2ef45d..9768988 100644
---- a/src/normaliz.cc
-+++ b/src/normaliz.cc
-@@ -27,6 +27,7 @@
- 
- #include "libnormaliz/cone.h"
- #include "libnormaliz/map_operations.h"
-+#include "libnormaliz/dynamic_bitset.h"
- 
- #include <vector>
-