diff --git a/community/gap/PKGBUILD b/community/gap/PKGBUILD
index e8d366d19..c80872d14 100644
--- a/community/gap/PKGBUILD
+++ b/community/gap/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgbase=gap
 pkgname=(gap gap-packages)
-pkgver=4.12.1
+pkgver=4.12.2
 pkgrel=2
 pkgdesc='Groups, Algorithms, Programming: a system for computational discrete algebra'
 arch=(x86_64)
@@ -16,17 +16,19 @@ url='https://www.gap-system.org/'
 license=(GPL)
 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)
-sha256sums=('f9ebef11ee31b210ce36e3c70960742b4e253282bbd5270adc9324273c92b016'
-            '72c4c931d5ed1b2cdeea5c5c65800cf1f510e79284f7d27228c9e52326b4b239')
+sha256sums=('672308745eb78a222494ee8dd6786edd5bc331456fcc6456ac064bdb28d587a8'
+            '33f8e2233e9aa74217741467f0138a932a2dfee212c774eaad0e0ef6876868c2')
 makedepends=(libxaw givaro mpfi cddlib boost libsemigroups c-xsc zeromq fplll wget chrpath fmt eigen normaliz jq)
 
 prepare() {
   cd gap-$pkgver
 
 # Use system libsemigroups
-  sed -e 's|test "$with_external_libsemigroups" = yes|true|' -i pkg/semigroups/configure
+  sed -e 's|need_included_libsemigroups=yes|need_included_libsemigroups=no|' -i pkg/semigroups/configure
 # Use system normaliz
-  sed -e 's|.\/build-normaliz.sh|true|' -i bin/BuildPackages.sh
+  rm pkg/normalizinterface/prerequisites.sh
+# Use system nauty
+  rm -r pkg/grape/{configure,Makefile*,nauty*}
 # 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
@@ -81,7 +83,7 @@ package_gap() {
 
 package_gap-packages() {
   depends=(gap)
-  optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float package'
+  optdepends=('libxaw: xgap package' 'c-xsc: float package' 'mpfi: float package' 'nauty: grape package'
               'libmpc: float package' 'fplll: float package' 'zeromq: ZeroMQ interface package' 'planarity: digraph package'
               'curl: curl interface package' 'libsemigroups: semigroups package' 'cddlib: CddLib interface package'
               'normaliz: NormalizInterface package' 'pari: alnuth package' 'singular: singular package' 'polymake: polymaking package')
@@ -109,6 +111,10 @@ package_gap-packages() {
 # remove bundled planarity
   rm -fr "$pkgdir"/usr/lib/gap/pkg/digraphs/bin/lib/
 
+# use system nauty in grape package
+  install -d "$pkgdir"/usr/lib/gap/pkg/grape/bin/x86_64-pc-linux-gnu-default64-kv8
+  ln -s /usr/bin/dreadnaut "$pkgdir"/usr/lib/gap/pkg/grape/bin/x86_64-pc-linux-gnu-default64-kv8
+
 # remove leftover binaries and source files
   find "$pkgdir"/usr/lib/gap/pkg -name .libs -o -name '*.o' | xargs rm -fr
   find "$pkgdir"/usr/lib/gap/pkg -type d -name src | xargs rm -fr