diff --git a/srcpkgs/libgphoto2/patches/fix-jpeg_mem_src.patch b/srcpkgs/libgphoto2/patches/fix-jpeg_mem_src.patch
deleted file mode 100644
index 65918ca9695..00000000000
--- a/srcpkgs/libgphoto2/patches/fix-jpeg_mem_src.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- camlibs/ax203/jpeg_memsrcdest.h	2015-08-08 17:57:29.000000000 +0200
-+++ camlibs/ax203/jpeg_memsrcdest.h	2016-06-16 10:41:12.793951660 +0200
-@@ -1,7 +1,7 @@
- #include <jpeglib.h>
- 
- void
--jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
-+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
- 	unsigned long bufsize);
- 
- void
---- camlibs/jl2005c/jpeg_memsrcdest.h	2015-08-08 17:57:29.000000000 +0200
-+++ camlibs/jl2005c/jpeg_memsrcdest.h	2016-06-16 10:41:12.793951660 +0200
-@@ -1,7 +1,7 @@
- #include <jpeglib.h>
- 
- void
--jpeg_mem_src (j_decompress_ptr cinfo, unsigned char * buffer,
-+jpeg_mem_src (j_decompress_ptr cinfo, const unsigned char * buffer,
- 	unsigned long bufsize);
- 
- void
diff --git a/srcpkgs/libgphoto2/template b/srcpkgs/libgphoto2/template
index 611d762c20a..908679ed5f9 100644
--- a/srcpkgs/libgphoto2/template
+++ b/srcpkgs/libgphoto2/template
@@ -1,18 +1,19 @@
 # Template file for 'libgphoto2'
 pkgname=libgphoto2
-version=2.5.10
-revision=2
+version=2.5.11
+revision=1
 build_style=gnu-configure
 configure_args="--disable-static --disable-rpath udevscriptdir=/usr/lib/udev"
 hostmakedepends="automake libtool pkg-config gettext-devel"
-makedepends="libltdl-devel libusb-compat-devel libjpeg-turbo-devel gd-devel libexif-devel"
+makedepends="libltdl-devel libusb-compat-devel libjpeg-turbo-devel gd-devel
+ libexif-devel libxml2-devel"
 depends="${pkgname}-udev-rules-${version}_${revision}"
 short_desc="Digital camera access library"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 license="GPL-2"
 homepage="http://www.gphoto.org"
 distfiles="${SOURCEFORGE_SITE}/gphoto/$pkgname-$version.tar.bz2"
-checksum=8d8668d432ba595c7466442aec2cf553bdf8782ec171291dbc65717c633a4ef2
+checksum=7fb61486d6c153fbbadc57b8bada8528abd289f46175bfaab09350f33f38e0aa
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends+=" libgphoto2"
@@ -29,15 +30,22 @@ post_install() {
 	# Remove recursive symlink
 	rm -f ${DESTDIR}/usr/include/gphoto2/gphoto2
 
+	vmkdir usr/lib/udev/hwdb.d
 	vmkdir usr/lib/udev/rules.d
 	if [ -z "$CROSS_BUILD" ]; then
 		LD_LIBRARY_PATH="${DESTDIR}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
 			CAMLIBS="${DESTDIR}/usr/lib/libgphoto2/${version}" \
-			${DESTDIR}/usr/lib/libgphoto2/print-camera-list udev-rules version 136 > \
+			${DESTDIR}/usr/lib/libgphoto2/print-camera-list udev-rules version 201 > \
 			${DESTDIR}/usr/lib/udev/rules.d/40-gphoto.rules
+		LD_LIBRARY_PATH="${DESTDIR}/usr/lib${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" \
+			CAMLIBS="${DESTDIR}/usr/lib/libgphoto2/${version}" \
+			${DESTDIR}/usr/lib/libgphoto2/print-camera-list hwdb > \
+			${DESTDIR}/usr/lib/udev/hwdb.d/20-gphoto.hwdb
 	else
-		/usr/lib/libgphoto2/print-camera-list udev-rules version 136 > \
+		/usr/lib/libgphoto2/print-camera-list udev-rules version 201 > \
 			${DESTDIR}/usr/lib/udev/rules.d/40-gphoto.rules
+		/usr/lib/libgphoto2/print-camera-list hwdb > \
+			${DESTDIR}/usr/lib/udev/hwdb.d/20-gphoto.hwdb
 	fi
 }
 
@@ -45,11 +53,12 @@ libgphoto2-udev-rules_package() {
 	short_desc+=" - udev rules"
 	noarch=yes
 	pkg_install() {
+		vmove usr/lib/udev/hwdb.d
 		vmove usr/lib/udev/rules.d
 	}
 }
 libgphoto2-devel_package() {
-	depends="libexif-devel libusb-compat-devel libgphoto2>=${version}_${revision}"
+	depends="libexif-devel libusb-compat-devel ${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/bin