diff --git a/apt-0.5.15lorg2-lorg-cache-limit.patch b/apt-0.5.15lorg2-lorg-cache-limit.patch
new file mode 100644
index 0000000..8f034c0
--- /dev/null
+++ b/apt-0.5.15lorg2-lorg-cache-limit.patch
@@ -0,0 +1,28 @@
+commit 1cccd482c8170e3d1a6c913681f9bdd455535569
+Author: Panu Matilainen <pmatilai@turre.koti.laiskiainen.org>
+Date:   Mon Jun 4 23:06:29 2007 +0300
+
+    - push cache-limit defaults up, people are starting to run out of space...
+
+diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc
+index 1dbd7bf..d743ec2 100644
+--- a/apt-pkg/pkgcachegen.cc
++++ b/apt-pkg/pkgcachegen.cc
+@@ -763,7 +763,7 @@ static bool CollectFileProvides(pkgCacheGenerator &Gen,
+ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+ 			MMap **OutMap,bool AllowMem)
+ {
+-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",12*1024*1024);
++   unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
+    
+    vector<pkgIndexFile *> Files(List.begin(),List.end());
+    unsigned long EndOfSource = Files.size();
+@@ -976,7 +976,7 @@ bool pkgMakeStatusCache(pkgSourceList &List,OpProgress &Progress,
+ /* */
+ bool pkgMakeOnlyStatusCache(OpProgress &Progress,DynamicMMap **OutMap)
+ {
+-   unsigned long MapSize = _config->FindI("APT::Cache-Limit",8*1024*1024);
++   unsigned long MapSize = _config->FindI("APT::Cache-Limit",24*1024*1024);
+    vector<pkgIndexFile *> Files;
+    unsigned long EndOfSource = Files.size();
+    if (_system->AddStatusFiles(Files) == false)
diff --git a/apt.spec b/apt.spec
index f1a1d47..0c19165 100644
--- a/apt.spec
+++ b/apt.spec
@@ -66,6 +66,7 @@ Patch54: apt-0.5.15lorg2-alt-genpkglist-reqfiles.patch
 Patch55: apt-0.5.15lorg2-alt-manifest.patch
 Patch56: apt-0.5.15lorg2-lorg-pkgcachegen-selfprov.patch
 Patch57: apt-0.5.15lorg2-alt-genpkglist-no-fileflags.patch
+Patch58: apt-0.5.15lorg2-lorg-cache-limit.patch
 
 # Normally not applied, but useful.
 Patch101: apt-0.5.4cnc9-alt-getsrc-debug.patch
@@ -271,6 +272,7 @@ This package contains method 'rsync' for APT.
 %patch55 -p1
 %patch56 -p1
 %patch57 -p1
+%patch58 -p1
 
 find -type f -name \*.orig -delete