diff --git a/extra/gf2x/.SRCINFO b/extra/gf2x/.SRCINFO
new file mode 100644
index 000000000..d0e2f98b1
--- /dev/null
+++ b/extra/gf2x/.SRCINFO
@@ -0,0 +1,13 @@
+pkgbase = gf2x
+	pkgdesc = A library for multiplying polynomials over the binary field
+	pkgver = 1.3.0
+	pkgrel = 3
+	url = https://gitlab.inria.fr/gf2x/gf2x
+	arch = x86_64
+	license = GPL-3.0-or-later
+	makedepends = git
+	depends = glibc
+	source = git+https://gitlab.inria.fr/gf2x/gf2x#tag=gf2x-1.3.0
+	sha256sums = becc47f5ca6e549393ea70147f7dc7b52d88af0ed5bfb9f2e3a4c47658bf48e9
+
+pkgname = gf2x
diff --git a/extra/gf2x/.nvchecker.toml b/extra/gf2x/.nvchecker.toml
new file mode 100644
index 000000000..66d06253f
--- /dev/null
+++ b/extra/gf2x/.nvchecker.toml
@@ -0,0 +1,6 @@
+[gf2x]
+source = 'gitlab'
+gitlab = 'gf2x/gf2x'
+host = 'gitlab.inria.fr'
+use_max_tag = true
+prefix = 'gf2x-'
diff --git a/extra/gf2x/PKGBUILD b/extra/gf2x/PKGBUILD
index dc28b463b..6dadaa91b 100644
--- a/extra/gf2x/PKGBUILD
+++ b/extra/gf2x/PKGBUILD
@@ -5,27 +5,36 @@
 
 pkgname=gf2x
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='A library for multiplying polynomials over the binary field'
 arch=(x86_64)
-url='https://gforge.inria.fr/projects/gf2x/'
-license=(GPL LGPL)
+url='https://gitlab.inria.fr/gf2x/gf2x'
+license=(GPL-3.0-or-later)
 depends=(glibc)
-source=(https://gitlab.inria.fr/gf2x/gf2x/uploads/c46b1047ba841c20d1225ae73ad6e4cd/gf2x-$pkgver.tar.gz)
-sha256sums=('9472cd651972a1de38e3c4c47697a86e0ecf19d7d33454d4bc2a62bc85841b59')
+makedepends=(git)
+source=(git+https://gitlab.inria.fr/gf2x/gf2x#tag=gf2x-$pkgver)
+sha256sums=('becc47f5ca6e549393ea70147f7dc7b52d88af0ed5bfb9f2e3a4c47658bf48e9')
+
+prepare() {
+  cd gf2x
+  git cherry-pick -n a2f0fd388c12ca0b9f4525c6cfbc515418dcbaf8 # Fix build
+  autoreconf -vi
+}
 
 build() {
-  cd gf2x-$pkgver
-  ./configure --prefix=/usr --disable-pclmul
+  cd gf2x
+  ./configure \
+    --prefix=/usr \
+    --disable-pclmul
   make
 }
 
 check() {
-  cd gf2x-$pkgver
+  cd gf2x
   make -k check
 }
 
 package() {
-  cd gf2x-$pkgver
+  cd gf2x
   make prefix="$pkgdir"/usr install
 }