diff --git a/libgphoto2/.SRCINFO b/libgphoto2/.SRCINFO
new file mode 100644
index 0000000000..06ff31c893
--- /dev/null
+++ b/libgphoto2/.SRCINFO
@@ -0,0 +1,23 @@
+pkgbase = libgphoto2
+	pkgdesc = Digital camera access library
+	pkgver = 2.5.31
+	pkgrel = 2
+	url = http://www.gphoto.org/
+	arch = x86_64
+	license = LGPL
+	makedepends = autoconf-archive
+	makedepends = git
+	depends = curl
+	depends = gd
+	depends = libexif
+	depends = libjpeg
+	depends = libltdl
+	depends = libusb
+	depends = libxml2
+	provides = libgphoto2.so
+	provides = libgphoto2_port.so
+	source = git+https://github.com/gphoto/libgphoto2#commit=ba28af2d22fd4cb7fa76a8ff569ba498e8021db5
+	validpgpkeys = 7C4AFD61D8AAE7570796A5172209D6902F969C95
+	b2sums = SKIP
+
+pkgname = libgphoto2
diff --git a/libgphoto2/.nvchecker.toml b/libgphoto2/.nvchecker.toml
new file mode 100644
index 0000000000..9f650c4f20
--- /dev/null
+++ b/libgphoto2/.nvchecker.toml
@@ -0,0 +1,4 @@
+[libgphoto2]
+source = "git"
+git = "https://github.com/gphoto/libgphoto2.git"
+prefix = "v"
diff --git a/libgphoto2/PKGBUILD b/libgphoto2/PKGBUILD
index 55f1072fda..c589b6e375 100644
--- a/libgphoto2/PKGBUILD
+++ b/libgphoto2/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=libgphoto2
 pkgver=2.5.31
-pkgrel=1
+pkgrel=2
 pkgdesc="Digital camera access library"
 url="http://www.gphoto.org/"
 arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
@@ -27,8 +27,10 @@ makedepends=(
 )
 provides=(libgphoto2{,_port}.so)
 _commit=ba28af2d22fd4cb7fa76a8ff569ba498e8021db5  # tags/libgphoto2-2_5_31-release
-source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit")
-b2sums=('SKIP')
+source=("git+https://github.com/gphoto/libgphoto2#commit=$_commit"
+        libgphoto2-2.5.31-c99.patch)
+b2sums=('4359a165282d4c1a512f9cf01367421e735897b0e790271848f1a1eafd8bfdd13e27257b0e62fdc089cd959b10135935b765c4646a0e564dacd85c7eb1f62c82'
+        '161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner
 
 pkgver() {
@@ -38,6 +40,9 @@ pkgver() {
 
 prepare() {
   cd $pkgname
+
+  patch -Np1 -i ${srcdir}/libgphoto2-2.5.31-c99.patch
+
   autoreconf -fvi
 }
 
diff --git a/libgphoto2/libgphoto2-2.5.31-c99.patch b/libgphoto2/libgphoto2-2.5.31-c99.patch
new file mode 100644
index 0000000000..fae8903f1e
--- /dev/null
+++ b/libgphoto2/libgphoto2-2.5.31-c99.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/919086
+https://github.com/gphoto/libgphoto2/issues/941
+https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5
+
+From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001
+From: Marcus Meissner <marcus@jet.franken.de>
+Date: Mon, 4 Dec 2023 13:26:08 +0100
+Subject: [PATCH] align outlen length with jpeg jeaders. fixes
+ https://github.com/gphoto/libgphoto2/issues/941
+
+--- a/camlibs/ptp2/chdk.c
++++ b/camlibs/ptp2/chdk.c
+@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+ 	struct		jpeg_error_mgr jerr;
+ 	JSAMPROW	row_ptr[1];
+ 	uint8_t		*outbuf = NULL, *tmprowbuf = NULL;
+-	uint64_t	outlen = 0;
++	unsigned long	outlen = 0;
+ 	unsigned int	row_inc;
+ 	int		sshift, dshift, xshift, skip;
+ 
+@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv,
+ 		sshift = 6;
+ 		dshift = (width/height > 2) ? 6 : 12;
+ 		xshift = 4;
+-	/* Digic 6 cameras: 8 bit per element UYVY,
+-	 * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
++		/* Digic 6 cameras: 8 bit per element UYVY,
++		 * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */
+ 	} else {
+ 		row_inc = buf_width*2;
+ 		sshift = 4;
+