diff -Nru libgphoto2-2.5.4/debian/changelog libgphoto2-2.5.4/debian/changelog
--- libgphoto2-2.5.4/debian/changelog	2014-04-28 11:50:55.000000000 +0000
+++ libgphoto2-2.5.4/debian/changelog	2014-06-10 15:45:18.000000000 +0000
@@ -1,3 +1,12 @@
+libgphoto2 (2.5.4-1ubuntu2) utopic; urgency=medium
+
+  * Add debian/libgphoto2-6.udev: Provide rule for generic "PtP device" to
+    unbreak cameras which aren't explicitly known to libgphoto by
+    vendor/product ID, until either hwdb or gvfs get fixed properly.
+    (LP: #1296275)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 10 Jun 2014 17:43:28 +0200
+
 libgphoto2 (2.5.4-1ubuntu1) utopic; urgency=medium
 
   * Merge with Debian unstable. Remaining Ubuntu changes:
diff -Nru libgphoto2-2.5.4/debian/libgphoto2-6.udev libgphoto2-2.5.4/debian/libgphoto2-6.udev
--- libgphoto2-2.5.4/debian/libgphoto2-6.udev	1970-01-01 00:00:00.000000000 +0000
+++ libgphoto2-2.5.4/debian/libgphoto2-6.udev	2014-06-10 15:43:25.000000000 +0000
@@ -0,0 +1,7 @@
+ACTION!="add", GOTO="libgphoto2_rules_end"
+SUBSYSTEM!="usb", GOTO="libgphoto2_usb_end"
+ENV{ID_USB_INTERFACES}=="", IMPORT{builtin}="usb_id"
+ACTION="add", ENV{ID_USB_INTERFACES}=="*:060101:*", ENV{ID_GPHOTO2}="1", ENV{GPHOTO2_DRIVER}="PTP", MODE="0664", GROUP="plugdev"
+
+LABEL="libgphoto2_rules_end"
+
diff -Nru libgphoto2-2.5.4/debian/rules libgphoto2-2.5.4/debian/rules
--- libgphoto2-2.5.4/debian/rules	2014-04-28 11:50:08.000000000 +0000
+++ libgphoto2-2.5.4/debian/rules	2014-06-10 15:46:17.000000000 +0000
@@ -42,6 +42,7 @@
 	# Generate the hwdb file
 	mkdir -p debian/libgphoto2-$(major)/lib/udev/hwdb.d/
 	CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list hwdb > debian/libgphoto2-$(major)/lib/udev/hwdb.d/20-libgphoto2-$(major).hwdb
+	dh_installudev
 endif
 
 override_dh_fixperms: