diff --git a/libgphoto2-fix-fuji.patch b/libgphoto2-fix-fuji.patch
new file mode 100644
index 0000000..bd7925d
--- /dev/null
+++ b/libgphoto2-fix-fuji.patch
@@ -0,0 +1,21 @@
+commit 472a9461b457b4d08ecf10a93bb7f1efdc2124c0
+Author: Marcus Meissner <marcus@jet.franken.de>
+Date:   Mon Jun 19 20:13:14 2017 +0200
+
+    ignore missing 0xd207 property on Fuji XT-2 without firmware update
+
+diff --git a/camlibs/ptp2/config.c b/camlibs/ptp2/config.c
+index 5a2a637f1..858f6bdbe 100644
+--- a/camlibs/ptp2/config.c
++++ b/camlibs/ptp2/config.c
+@@ -482,6 +482,10 @@ camera_prepare_capture (Camera *camera, GPContext *context)
+ 		{
+ 			PTPPropertyValue propval;
+ 
++			/* without the firmware update ... not an error... */
++			if (!have_prop (camera, PTP_VENDOR_FUJI, 0xd207))
++				return GP_OK;
++
+ 			propval.u16 = 0x0002;
+ 			C_PTP (ptp_setdevicepropvalue (params, 0xd207, &propval, PTP_DTC_UINT16));
+ 			return GP_OK;
diff --git a/libgphoto2.changes b/libgphoto2.changes
index 6d74639..1085a69 100644
--- a/libgphoto2.changes
+++ b/libgphoto2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sun Jul 16 13:34:04 UTC 2017 - meissner@suse.com
+
+- libgphoto2-fix-fuji.patch: check before using a ptp property that
+  is only available in some updated Fuji cameras (bsc#1048853)
+
 -------------------------------------------------------------------
 Mon Jun  5 18:58:54 UTC 2017 - meissner@suse.com
 
diff --git a/libgphoto2.spec b/libgphoto2.spec
index fd6779e..8425689 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -53,6 +53,7 @@ Version:        2.5.14
 Release:        0
 Source0:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{name}-%{version}.tar.bz2
 Source1:        https://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}//%{name}-%{version}.tar.bz2.asc
+Patch0:         libgphoto2-fix-fuji.patch
 Source2:        %name.keyring
 Source3:        baselibs.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -134,6 +135,7 @@ This is its API documentation in HTML format.
 
 %prep
 %setup -q
+%patch0 -p1
 (cd doc; tar xaf libgphoto2-api.html.tar.gz)
 
 %build