diff --git a/apt-0.5.15lorg3.94-tool-headers.patch b/apt-0.5.15lorg3.94-tool-headers.patch
new file mode 100644
index 0000000..c1cae06
--- /dev/null
+++ b/apt-0.5.15lorg3.94-tool-headers.patch
@@ -0,0 +1,52 @@
+commit d6087997e31317a7fdcb53973e69e1f9b3c0a0ac
+Author: Panu Matilainen <pmatilai@laiskiainen.org>
+Date:   Fri Jan 11 23:00:35 2008 +0200
+
+    Oops, forgot to adjust tools/ for rpmhandler going private
+
+diff --git a/tools/cached_md5.cc b/tools/cached_md5.cc
+index 4df228b..5bf789b 100644
+--- a/tools/cached_md5.cc
++++ b/tools/cached_md5.cc
+@@ -17,9 +17,9 @@
+ 
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/tagfile.h>
+-#include <apt-pkg/rpmhandler.h>
+ #include <apt-pkg/configuration.h>
+ #include <apt-pkg/md5.h>
++#include "rpmhandler.h"
+ 
+ #include <config.h>
+ 
+diff --git a/tools/genpkglist.cc b/tools/genpkglist.cc
+index e067790..c0c608c 100644
+--- a/tools/genpkglist.cc
++++ b/tools/genpkglist.cc
+@@ -20,9 +20,9 @@
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/tagfile.h>
+ #include <apt-pkg/configuration.h>
+-#include <apt-pkg/rpmhandler.h>
+ #include <config.h>
+ 
++#include "rpmhandler.h"
+ #include "cached_md5.h"
+ 
+ #if RPM_VERSION >= 0x040100
+diff --git a/tools/gensrclist.cc b/tools/gensrclist.cc
+index ea1bb92..0597560 100644
+--- a/tools/gensrclist.cc
++++ b/tools/gensrclist.cc
+@@ -20,10 +20,10 @@
+ 
+ #include <apt-pkg/error.h>
+ #include <apt-pkg/tagfile.h>
+-#include <apt-pkg/rpmhandler.h>
+ #include <apt-pkg/configuration.h>
+ #include <config.h>
+ 
++#include "rpmhandler.h"
+ #include "cached_md5.h"
+ 
+ #if RPM_VERSION >= 0x040100
diff --git a/apt.spec b/apt.spec
index 2b5fc79..f0b0ffc 100644
--- a/apt.spec
+++ b/apt.spec
@@ -36,6 +36,7 @@ Source150: default.conf
 Patch0: apt-0.5.15lorg3.2-ppc.patch
 # band aid for mmap issues (#211254)
 Patch1: apt-0.5.15lorg3.x-cache-corruption.patch
+Patch2: apt-0.5.15lorg3.94-tool-headers.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -120,6 +121,7 @@ RHL/RHEL/FC distributions.
 %setup -q
 %patch0 -p1 -b .ppc
 %patch1 -p0 -b .mmap
+%patch2 -p1 -b .toolheader
 
 install -pm 644 %{SOURCE19} comps2prio.xsl