diff --git a/libcdio/.SRCINFO b/libcdio/.SRCINFO
index 9890bdfc9d..ed800fcad3 100644
--- a/libcdio/.SRCINFO
+++ b/libcdio/.SRCINFO
@@ -1,23 +1,21 @@
 pkgbase = libcdio
 	pkgdesc = GNU Compact Disc Input and Control Library
-	pkgver = 2.1.0
-	pkgrel = 4.1
+	pkgver = 2.2.0
+	pkgrel = 1
 	url = https://www.gnu.org/software/libcdio/
 	arch = x86_64
 	arch = powerpc64le
 	arch = powerpc64
 	arch = powerpc
 	arch = riscv64
-	license = GPL3
+	license = GPL-3.0-or-later
 	makedepends = git
 	makedepends = help2man
-	depends = ncurses
 	depends = gcc-libs
-	options = !lto
-	source = git+https://git.savannah.gnu.org/git/libcdio.git#commit=9c7a2779846da161279bc1501e83c849cf89a594
-	source = arm-t64-redirect-fix.patch
+	depends = glibc
+	depends = ncurses
+	source = git+https://github.com/libcdio/libcdio#tag=2.2.0
 	validpgpkeys = DAA63BC2582034A02B923D521A8DE5008275EC21
-	sha256sums = c4c46da0ef86e373f99e201db749d3c3df796261a31ab989dde0ec9ffe12d352
-	sha256sums = 7bb4dbd9fe4a7c5323c5916ce989d2f0e87fa5a7d41e56141f070cd0adfb1095
+	b2sums = f7a71168f5957f073bf95d0fe68a69a6129f0c11410a1fa4927b41ccfc3f3828f2801e5e91597b6bab33523be4995b9a548d04a1c42463ed96367fb9c56780f5
 
 pkgname = libcdio
diff --git a/libcdio/.nvchecker.toml b/libcdio/.nvchecker.toml
new file mode 100644
index 0000000000..8d07489717
--- /dev/null
+++ b/libcdio/.nvchecker.toml
@@ -0,0 +1,4 @@
+[libcdio]
+source = "github"
+github = "libcdio/libcdio"
+use_max_tag = true
diff --git a/libcdio/PKGBUILD b/libcdio/PKGBUILD
index 02aaac7540..01c47a6b5a 100644
--- a/libcdio/PKGBUILD
+++ b/libcdio/PKGBUILD
@@ -3,47 +3,50 @@
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=libcdio
-pkgver=2.1.0
-pkgrel=4.1
+pkgver=2.2.0
+pkgrel=1
 pkgdesc="GNU Compact Disc Input and Control Library"
 url="https://www.gnu.org/software/libcdio/"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-license=(GPL3)
-depends=(ncurses gcc-libs)
-makedepends=(git help2man)
-options=(!lto)
-_commit=9c7a2779846da161279bc1501e83c849cf89a594  # tags/release-2.1.0
-source=("git+https://git.savannah.gnu.org/git/libcdio.git#commit=$_commit"
-        arm-t64-redirect-fix.patch)
-sha256sums=('c4c46da0ef86e373f99e201db749d3c3df796261a31ab989dde0ec9ffe12d352'
-            '7bb4dbd9fe4a7c5323c5916ce989d2f0e87fa5a7d41e56141f070cd0adfb1095')
-validpgpkeys=('DAA63BC2582034A02B923D521A8DE5008275EC21') # R. Bernstein
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^release-//;s/[^-]*-g/r&/;s/-/+/g'
-}
+license=(GPL-3.0-or-later)
+depends=(
+  gcc-libs
+  glibc
+  ncurses
+)
+makedepends=(
+  git
+  help2man
+)
+source=(
+  "git+https://github.com/libcdio/libcdio#tag=$pkgver"
+)
+b2sums=('f7a71168f5957f073bf95d0fe68a69a6129f0c11410a1fa4927b41ccfc3f3828f2801e5e91597b6bab33523be4995b9a548d04a1c42463ed96367fb9c56780f5')
+validpgpkeys=(
+  DAA63BC2582034A02B923D521A8DE5008275EC21 # R. Bernstein <rocky@panix.com>
+)
 
 prepare() {
   cd $pkgname
-
-  # Format security
-  git cherry-pick -n 2adb43c60afc6e98e94d86dad9f93d3df52862b1
-
-  # realpath test failure
-  git cherry-pick -n 56335fff0f21d294cd0e478d49542a43e9495ed0
-
-  # Fix implicit declaration errors on fseek64
-  patch -Np1 -i ${srcdir}/arm-t64-redirect-fix.patch
-
   autoreconf -fvi
 }
 
 build() {
-  cd $pkgname
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --disable-vcd-info --disable-cddb --enable-cpp-progs --disable-static \
+  local configure_options=(
+    --prefix=/usr
+    --sysconfdir=/etc
+    --localstatedir=/var
+    --disable-cddb
+    --enable-cpp-progs
     --enable-maintainer-mode
+    --disable-static
+    --disable-vcd-info
+  )
+
+  export CFLAGS+=' -Wno-implicit-function-declaration'
+
+  cd $pkgname
+  ./configure "${configure_options[@]}"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
   make
 }
@@ -56,7 +59,6 @@ check() {
 package() {
   cd $pkgname
   make DESTDIR="$pkgdir" install
-
-  sed -e "/define CDIO_LIBCDIO_SOURCE_PATH/s|.*|/* #undef CDIO_LIBCDIO_SOURCE_PATH */|" \
-      -i "$pkgdir/usr/include/cdio/cdio_config.h"
 }
+
+# vim:set sw=2 sts=-1 et: