diff --git a/.SRCINFO b/.SRCINFO
index 958803f38038..c11d94d8bd9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnutls3.8.9
 	pkgdesc = A library which provides a secure layer over a reliable transport layer
 	pkgver = 3.8.9
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.gnutls.org
 	arch = x86_64
 	license = GPL-3.0-or-later AND LGPL-2.1-or-later
@@ -25,15 +25,17 @@ pkgbase = gnutls3.8.9
 	options = !zipman
 	backup = etc/gnutls3.8.9/config
 	backup = etc/modules-load.d/gnutls3.8.9.conf
-	source = gnutls-3.8.9.tar.xz::https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.9.tar.xz
-	source = gnutls-3.8.9.tar.xz.sig::https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.9.tar.xz.sig
-	source = gnutls-ktls_disable_keyupdate_test.patch
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.9.tar.xz
+	source = https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.9.tar.xz.sig
+	source = gnutls_ktls_disable_keyupdate_test.patch
+	source = gnutls_hide_m4_ifdef_from_autopoint.patch::https://gitlab.com/gnutls/gnutls/-/merge_requests/2061.patch
 	source = gnutls3.8.9-config
 	source = gnutls3.8.9.modules-load
 	validpgpkeys = 462225C3B46F34879FC8496CD605848ED7E69871
 	sha256sums = 69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed
 	sha256sums = SKIP
 	sha256sums = 2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708
+	sha256sums = cb9000c5c73a4be7fc68408d8efbb485c2deacfa2098152bc84dcad44906fd1a
 	sha256sums = 22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5
 	sha256sums = bdc4c4eb010d766cb8dca8832adddd58b964e715473a823cfd7a6b236a54ceb6
 
diff --git a/.gitignore b/.gitignore
index 61011d4f490b..4487366aabdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,6 @@
 !.SRCINFO
 !.gitignore
 !.nvchecker.toml
-!*.patch
+!gnutls_ktls_disable_keyupdate_test.patch
 !gnutls3.8.9-config
 !*.modules-load
diff --git a/PKGBUILD b/PKGBUILD
index d9062136b802..5ccfa90add77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,11 +4,15 @@
 
 _basename=gnutls
 pkgver=3.8.9
-pkgrel=1
+pkgrel=2
 pkgname="${_basename}${pkgver}"
 pkgdesc="A library which provides a secure layer over a reliable transport layer"
-arch=('x86_64')
-license=('GPL-3.0-or-later AND LGPL-2.1-or-later')
+arch=(
+  'x86_64'
+)
+license=(
+  'GPL-3.0-or-later AND LGPL-2.1-or-later'
+)
 url="https://www.gnutls.org"
 depends=(
   'brotli>=1.0.0'
@@ -43,27 +47,35 @@ backup=(
   "etc/modules-load.d/${pkgname}.conf"
 )
 _pkgsrc="${_basename}-${pkgver}"
-source=("${_pkgsrc}.tar.xz::https://www.gnupg.org/ftp/gcrypt/${_basename}/v${pkgver%.*}/${_pkgsrc}.tar.xz"
-        "${_pkgsrc}.tar.xz.sig::https://www.gnupg.org/ftp/gcrypt/${_basename}/v${pkgver%.*}/${_pkgsrc}.tar.xz.sig"
-        "${_basename}-ktls_disable_keyupdate_test.patch"
-        "${pkgname}-config"
-        "${pkgname}.modules-load")
+source=(
+  "https://www.gnupg.org/ftp/gcrypt/${_basename}/v${pkgver%.*}/${_pkgsrc}.tar.xz"
+  "https://www.gnupg.org/ftp/gcrypt/${_basename}/v${pkgver%.*}/${_pkgsrc}.tar.xz.sig"
+  "${_basename}_ktls_disable_keyupdate_test.patch"
+  "${_basename}_hide_m4_ifdef_from_autopoint.patch::https://gitlab.com/gnutls/gnutls/-/merge_requests/2061.patch"
+  "${pkgname}-config"
+  "${pkgname}.modules-load"
+)
 sha256sums=('69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed'
             'SKIP'
             '2a911615739cb327b6dced36b595ea10c89f40bb7274d062dab14a9ecfe89708'
+            'cb9000c5c73a4be7fc68408d8efbb485c2deacfa2098152bc84dcad44906fd1a'
             '22e614510fe52defe8c233ce3e5ead2205739fd967657ce3176ca121f3c562b5'
             'bdc4c4eb010d766cb8dca8832adddd58b964e715473a823cfd7a6b236a54ceb6')
-validpgpkeys=('462225C3B46F34879FC8496CD605848ED7E69871') # "Daiki Ueno <ueno@unixuser.org>"
+validpgpkeys=(
+  '462225C3B46F34879FC8496CD605848ED7E69871' # "Daiki Ueno <ueno@unixuser.org>"
+)
 
 prepare() {
   cd "${srcdir}/${_pkgsrc}"
-  patch -Np1 -i "${srcdir}/${_basename}-ktls_disable_keyupdate_test.patch"
+  patch -Np1 -i "${srcdir}/${_basename}_ktls_disable_keyupdate_test.patch"
+  # https://gitlab.com/gnutls/gnutls/-/issues/1792
+  patch -Np1 -i "${srcdir}/${_basename}_hide_m4_ifdef_from_autopoint.patch"
 }
 
 build() {
   local configure_options=(
     --prefix='/usr'
-    --program-suffix="${pkgver}"
+    --program-suffix="-${pkgver}"
     --includedir="/usr/include/${pkgname}"
     --libdir="/usr/lib/${pkgname}"
     --docdir="/usr/share/doc/${pkgname}"
diff --git a/gnutls-ktls_disable_keyupdate_test.patch b/gnutls_ktls_disable_keyupdate_test.patch
similarity index 100%
rename from gnutls-ktls_disable_keyupdate_test.patch
rename to gnutls_ktls_disable_keyupdate_test.patch