diff --git a/camlibs/ptp2/ChangeLog b/camlibs/ptp2/ChangeLog
index a940ec390..0f429c8d3 100644
--- a/camlibs/ptp2/ChangeLog
+++ b/camlibs/ptp2/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-29 Mariusz Woloszyn
+	* library.c: Fixed a small problem that caused objects of undefined
+	type not beeing downloadable. Now they are downloadable if the Thumb
+	type is known.
+
 2004-05-24  Marcus Meissner  <marcus@jet.franken.de>
 
 	* library.c: Added Canon PowerShot SD110.
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index ef6b27def..3afd175e3 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -1063,9 +1063,11 @@ get_file_func (CameraFilesystem *fs, const char *folder, const char *filename,
 		/* we do not allow downloading unknown type files as in most
 		cases they are special file (like firmware or control) which
 		sometimes _cannot_ be downloaded. doing so we avoid errors.*/
-		if ((oi->ObjectFormat == PTP_OFC_Undefined) ||
-			(oi->ObjectFormat == PTP_OFC_Association))
+		if (oi->ObjectFormat == PTP_OFC_Association ||
+			(oi->ObjectFormat == PTP_OFC_Undefined &&
+				oi->ThumbFormat == PTP_OFC_Undefined))
 			return (GP_ERROR_NOT_SUPPORTED);
+
 		size=oi->ObjectCompressedSize;
 		CPR (context, ptp_getobject(&camera->pl->params,
 			camera->pl->params.handles.Handler[object_id],