Index: lib/dpkg/dpkg-db.h
--- lib/dpkg/dpkg-db.h.orig	2009-07-08 11:06:36 +0200
+++ lib/dpkg/dpkg-db.h	2009-07-09 11:29:46 +0200
@@ -29,6 +29,7 @@
 
 #include <sys/types.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 struct versionrevision {
   unsigned long epoch;
Index: lib/dpkg/tarfn.c
--- lib/dpkg/tarfn.c.orig	2009-07-08 11:06:36 +0200
+++ lib/dpkg/tarfn.c	2009-07-09 11:29:46 +0200
@@ -66,7 +66,9 @@
 	int	len;
 	char *	str;
 
-	len = strnlen(s, size);
+	len = strlen(s);
+    if (len > size)
+        len = size;
 	str = m_malloc(len + 1);
 	memcpy(str, s, len);
 	str[len] = '\0';
Index: man/Makefile.in
--- man/Makefile.in.orig	2009-07-08 11:28:41 +0200
+++ man/Makefile.in	2009-07-09 11:29:46 +0200
@@ -197,7 +197,7 @@
 top_srcdir = @top_srcdir@
 
 # Extract the list of languages from the po4a config file.
-LINGUAS = `sed -ne 's/^.*\[po4a_langs\] \(.*\)$$/\1/p' $(srcdir)/po/po4a.cfg`
+LINGUAS =
 dist_man_MANS = deb-control.5 deb-version.5 deb-shlibs.5 \
 	deb-substvars.5 deb-symbols.5 deb-triggers.5 deb-old.5 \
 	deb-override.5 deb.5 dpkg-architecture.1 dpkg-buildpackage.1 \
@@ -523,7 +523,7 @@
 all-local: all-local-@USE_NLS@
 
 all-local-no:
-all-local-yes: man.stamp
+all-local-yes:
 
 # FIXME: Use a stamp file until po4a supports them internally.
 man.stamp:
Index: scripts/Makefile.in
--- scripts/Makefile.in.orig	2009-07-08 11:28:41 +0200
+++ scripts/Makefile.in	2009-07-09 11:29:46 +0200
@@ -739,8 +739,8 @@
 	$(INSTALL_SCRIPT) install-info $(DESTDIR)$(sbindir)
 
 install-data-local:
-	$(mkdir_p) $(DESTDIR)$(sysconfdir)/alternatives
-	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/alternatives/README
+	$(mkdir_p) $(DESTDIR)$(sysconfdir)/dpkg/alternatives
+	$(INSTALL_DATA) $(srcdir)/README.alternatives $(DESTDIR)$(sysconfdir)/dpkg/alternatives/README
 
 # Ideally we'd use 'sed -i', but unfortunately that's not portable.
 install-data-hook: