diff --git a/libgphoto2-4096files.patch b/libgphoto2-4096files.patch
new file mode 100644
index 0000000..788faab
--- /dev/null
+++ b/libgphoto2-4096files.patch
@@ -0,0 +1,13 @@
+Index: libgphoto2-2.4.9/libgphoto2/gphoto2-list.c
+===================================================================
+--- libgphoto2-2.4.9.orig/libgphoto2/gphoto2-list.c
++++ libgphoto2-2.4.9/libgphoto2/gphoto2-list.c
+@@ -72,7 +72,7 @@
+ 
+ #ifdef CAMERALIST_STRUCT_COMPATIBILITY
+ 
+-#define MAX_ENTRIES 1024
++#define MAX_ENTRIES 4096
+ #define MAX_LIST_STRING_LENGTH 128
+ struct _CameraList {
+ 	int  count;
diff --git a/libgphoto2.changes b/libgphoto2.changes
index 3a2c617..e7ece22 100644
--- a/libgphoto2.changes
+++ b/libgphoto2.changes
@@ -1,6 +1,7 @@
 -------------------------------------------------------------------
-Thu Jun 17 17:39:28 CEST 2010 - meissner@suse.de
+Mon Jun 21 16:43:41 CEST 2010 - meissner@suse.de
 
+- bump maximum file limit to 4096, as 2.5 is not ready yet bnc#439065
 - Fixed some bugs in the ptp2 drivers.
 
 -------------------------------------------------------------------
diff --git a/libgphoto2.spec b/libgphoto2.spec
index c8d71fc..b8c2b4c 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -35,6 +35,7 @@ Release:        2
 Source0:        libgphoto2-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch0:         libgphoto24-branch.patch
+Patch1:         libgphoto2-4096files.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       %{name}-lang = %{version}
 
@@ -70,6 +71,7 @@ These are its development libraries and headers.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f . libgphoto2_port}}