diff --git a/apt-pkg/rpm/aptcallback.cc b/apt-pkg/rpm/aptcallback.cc
index 24b4cd3..9c0b54e 100644
--- a/apt-pkg/rpm/aptcallback.cc
+++ b/apt-pkg/rpm/aptcallback.cc
@@ -1,5 +1,10 @@
+#include <config.h>
+
 #include <map>
 #include <stdio.h>
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 #include <apti18n.h>
 
diff --git a/apt-pkg/rpm/rpmhandler.h b/apt-pkg/rpm/rpmhandler.h
index 4d397f2..808f81d 100644
--- a/apt-pkg/rpm/rpmhandler.h
+++ b/apt-pkg/rpm/rpmhandler.h
@@ -21,6 +21,9 @@
 #include "sqlite.h"
 #endif
 
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 #include <rpm/rpmmacro.h>
 
diff --git a/apt-pkg/rpm/rpmpackagedata.cc b/apt-pkg/rpm/rpmpackagedata.cc
index 08376e1..c4f6494 100644
--- a/apt-pkg/rpm/rpmpackagedata.cc
+++ b/apt-pkg/rpm/rpmpackagedata.cc
@@ -12,6 +12,9 @@
 
 #include <apti18n.h>
 
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 
 RPMPackageData::RPMPackageData()
diff --git a/apt-pkg/rpm/rpmpm.h b/apt-pkg/rpm/rpmpm.h
index 84f383b..425f2b1 100644
--- a/apt-pkg/rpm/rpmpm.h
+++ b/apt-pkg/rpm/rpmpm.h
@@ -11,6 +11,9 @@
 #ifndef PKGLIB_rpmPM_H
 #define PKGLIB_rpmPM_H
 
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 #if RPM_VERSION >= 0x040100
 #include <rpm/rpmts.h>
diff --git a/apt-pkg/rpm/rpmversion.cc b/apt-pkg/rpm/rpmversion.cc
index b6807fd..d5c3fee 100644
--- a/apt-pkg/rpm/rpmversion.cc
+++ b/apt-pkg/rpm/rpmversion.cc
@@ -27,6 +27,9 @@
 #include "rpmversion.h"
 #include <apt-pkg/pkgcache.h>
 
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 
 #include <stdlib.h>
 msgstr "Erro escrevendo no arquivo"
 
-#: methods/http.cc:848
+#: methods/http.cc:849
 msgid "Error writing to the file"
 msgstr "Erro escrevendo no arquivo"
 
-#: methods/http.cc:862
+#: methods/http.cc:863
 msgid "Error reading from server Remote end closed connection"
 msgstr "Erro lendo do servidor. O site remoto fechou a conex?o."
 
-#: methods/http.cc:864
+#: methods/http.cc:865
 msgid "Error reading from server"
 msgstr "Erro lendo do servidor"
 
-#: methods/http.cc:1224
+#: methods/http.cc:1225
 msgid "Bad header Data"
 msgstr "Dados do cabe?alho inv?lidos"
 
-#: methods/http.cc:1241
+#: methods/http.cc:1242
 msgid "Connection failed"
 msgstr "Conex?o falhou"
 
-#: methods/http.cc:1372
+#: methods/http.cc:1373
 msgid "Internal error"
 msgstr "Erro interno"
 
diff --git a/tools/cached_md5.cc b/tools/cached_md5.cc
index 5bf789b..0e625d1 100644
--- a/tools/cached_md5.cc
+++ b/tools/cached_md5.cc
@@ -1,12 +1,12 @@
 /*
  * $Id: cached_md5.cc,v 1.4 2003/01/29 13:47:31 niemeyer Exp $
  */
+#include <config.h>
 #include <alloca.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/tools/countpkglist.cc b/tools/countpkglist.cc
index 6eb80ba..a4d4a2a 100644
--- a/tools/countpkglist.cc
+++ b/tools/countpkglist.cc
@@ -1,7 +1,12 @@
+#include <config.h>
+
 #include <stdio.h>
 #include <errno.h>
 #include <string.h>
 
+#if RPM_VERSION >= 0x050000
+#include <rpm/rpm4compat.h>
+#endif
 #include <rpm/rpmlib.h>
 
 int main(int argc, char *argv[])
diff --git a/tools/genpkglist.cc b/tools/genpkglist.cc
index c0c608c..7f92aca 100644
--- a/tools/genpkglist.cc
+++ b/tools/genpkglist.cc
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
diff --git a/tools/gensrclist.cc b/tools/gensrclist.cc
index 0597560..005bac0 100644
--- a/tools/gensrclist.cc
+++ b/tools/gensrclist.cc
@@ -6,7 +6,6 @@
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <rpm/rpmlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -334,7 +333,7 @@ int main(int argc, char ** argv)
 	    
 	    // the std tags
 	    for (i = 0; i < numTags; i++) {
-	       int type, count;
+	       int_32 type, count;
 	       void *data;
 	       int res;
 	       
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.cc.ark	2008-06-10 08:10:11.000000000 +0200
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/rpmhandler.cc	2008-06-10 08:10:21.000000000 +0200
@@ -495,7 +495,7 @@ RPMFileHandler::RPMFileHandler(string Fi
    {
       
       _error->Error(_("could not open RPM package list file %s: %s"),
-		    File.c_str(), rpmErrorString());
+		    File.c_str(), rpmlogMessage());
       _error->Error(_("... do you need to run \"apt-get update\" first?"));
       return;
    }
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc.ark	2008-06-10 08:52:23.069258351 +0200
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.cc	2008-06-10 08:52:39.099231503 +0200
@@ -40,9 +40,9 @@ void * rpmCallback(const Header h,
 #else
 void * rpmCallback(const void * arg, 
 #endif
-		   const rpmCallbackType what,
-                   const long long unsigned int amount,
-                   const long long unsigned int total,
+		   rpmCallbackType what,
+                   uint64_t amount,
+                   uint64_t total,
 		   const void * pkgKey, void * data)
 
 {
--- apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.h.ark	2008-06-10 08:54:54.382552639 +0200
+++ apt-0.5.15lorg3.94a/apt-pkg/rpm/aptcallback.h	2008-06-10 09:09:40.879961457 +0200
@@ -15,9 +15,9 @@ void * rpmCallback(const Header h,
 #else
 void * rpmCallback(const void * arg, 
 #endif
-			const rpmCallbackType what,
-                        const long long unsigned int amount,
-                        const long long unsigned int total,
+			rpmCallbackType what,
+                        uint64_t amount,
+                        uint64_t total,
 			const void * pkgKey, void * data);
 
 #endif /* _APTRPM_RPMCALLBACK_H */