diff --git a/libgphoto2/.SRCINFO b/libgphoto2/.SRCINFO
index 06ff31c893..def43508fa 100644
--- a/libgphoto2/.SRCINFO
+++ b/libgphoto2/.SRCINFO
@@ -1,23 +1,29 @@
 pkgbase = libgphoto2
 	pkgdesc = Digital camera access library
 	pkgver = 2.5.31
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gphoto.org/
 	arch = x86_64
-	license = LGPL
+	arch = powerpc64le
+	arch = powerpc64
+	arch = powerpc
+	arch = riscv64
+	license = LGPL-2.1-or-later
 	makedepends = autoconf-archive
 	makedepends = git
+	depends = bash
 	depends = curl
 	depends = gd
+	depends = glibc
 	depends = libexif
-	depends = libjpeg
+	depends = libjpeg-turbo
 	depends = libltdl
 	depends = libusb
 	depends = libxml2
 	provides = libgphoto2.so
 	provides = libgphoto2_port.so
-	source = git+https://github.com/gphoto/libgphoto2#commit=ba28af2d22fd4cb7fa76a8ff569ba498e8021db5
+	source = git+https://github.com/gphoto/libgphoto2#tag=v2.5.31
 	validpgpkeys = 7C4AFD61D8AAE7570796A5172209D6902F969C95
-	b2sums = SKIP
+	b2sums = 4359a165282d4c1a512f9cf01367421e735897b0e790271848f1a1eafd8bfdd13e27257b0e62fdc089cd959b10135935b765c4646a0e564dacd85c7eb1f62c82
 
 pkgname = libgphoto2
diff --git a/libgphoto2/.nvchecker.toml b/libgphoto2/.nvchecker.toml
index 9f650c4f20..4e11291be0 100644
--- a/libgphoto2/.nvchecker.toml
+++ b/libgphoto2/.nvchecker.toml
@@ -1,4 +1,6 @@
 [libgphoto2]
-source = "git"
-git = "https://github.com/gphoto/libgphoto2.git"
+source = "github"
+github = "gphoto/libgphoto2"
+use_max_tag = true
+include_regex = 'v\d+(\.\d+)*'
 prefix = "v"
diff --git a/libgphoto2/PKGBUILD b/libgphoto2/PKGBUILD
index c6a5cb77b7..e7be7b9738 100644
--- a/libgphoto2/PKGBUILD
+++ b/libgphoto2/PKGBUILD
@@ -7,16 +7,18 @@
 
 pkgname=libgphoto2
 pkgver=2.5.31
-pkgrel=2.1
+pkgrel=3
 pkgdesc="Digital camera access library"
 url="http://www.gphoto.org/"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
-license=(LGPL)
+license=(LGPL-2.1-or-later)
 depends=(
+  bash
   curl
   gd
+  glibc
   libexif
-  libjpeg
+  libjpeg-turbo
   libltdl
   libusb
   libxml2
@@ -26,23 +28,14 @@ makedepends=(
   git
 )
 provides=(libgphoto2{,_port}.so)
-_commit=ba28af2d22fd4cb7fa76a8ff569ba498e8021db5  # tags/libgphoto2-2_5_31-release
-source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit"
-        libgphoto2-2.5.31-c99.patch)
-b2sums=('4359a165282d4c1a512f9cf01367421e735897b0e790271848f1a1eafd8bfdd13e27257b0e62fdc089cd959b10135935b765c4646a0e564dacd85c7eb1f62c82'
-        '161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8')
-validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner
-
-pkgver() {
-  cd $pkgname
-  git describe --tags | sed 's/^libgphoto2-//;s/-release//;s/^v//;s/_/./g;s/[^-]*-g/r&/;s/-/+/g'
-}
+source=("git+https://github.com/gphoto/libgphoto2#tag=v$pkgver")
+b2sums=('4359a165282d4c1a512f9cf01367421e735897b0e790271848f1a1eafd8bfdd13e27257b0e62fdc089cd959b10135935b765c4646a0e564dacd85c7eb1f62c82')
+validpgpkeys=(
+  7C4AFD61D8AAE7570796A5172209D6902F969C95 # Marcus Meissner <marcus@jet.franken.de>
+)
 
 prepare() {
   cd $pkgname
-
-  patch -Np1 -i ${srcdir}/libgphoto2-2.5.31-c99.patch
-
   autoreconf -fvi
 }
 
@@ -54,6 +47,10 @@ build() {
     --disable-rpath
   )
 
+  case "${CARCH}" in
+    powerpc) export CFLAGS+=' -Wno-incompatible-pointer-types' ;;
+  esac
+
   cd $pkgname
   ./configure "${configure_options[@]}"
   sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
@@ -61,25 +58,20 @@ build() {
 }
 
 package() {
-  cd $pkgname
-  make DESTDIR="$pkgdir" install
+  make -C $pkgname DESTDIR="$pkgdir" install
 
   # Remove unused udev helper
   rm -rv "$pkgdir/usr/lib/udev"
 
-  _genudev
+  (
+    export LD_LIBRARY_PATH="$pkgdir/usr/lib"
+    export CAMLIBS="$PWD/$pkgver"
+
+    "$pkgdir/usr/lib/libgphoto2/print-camera-list" hwdb \
+      | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/hwdb.d/20-gphoto.hwdb"
+    "$pkgdir/usr/lib/libgphoto2/print-camera-list" udev-rules version 201 \
+      | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/rules.d/40-gphoto.rules"
+  )
 }
 
-_genudev() (
-  cd "$pkgdir/usr/lib/libgphoto2"
-
-  export LD_LIBRARY_PATH="$pkgdir/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
-  export CAMLIBS="$PWD/$pkgver"
-
-  ./print-camera-list hwdb \
-    | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/hwdb.d/20-gphoto.hwdb"
-  ./print-camera-list udev-rules version 201 \
-    | install -Dm644 /dev/stdin "$pkgdir/usr/lib/udev/rules.d/40-gphoto.rules"
-)
-
 # vim:set sw=2 sts=-1 et: