Index: configure
--- configure.orig	2016-11-06 12:48:31.356130000 +0100
+++ configure	2016-11-06 12:49:37.176134468 +0100
@@ -23976,7 +23976,7 @@
 else
 
     dpkg_save_CFLAGS=$CFLAGS
-    CFLAGS="-Werror -Wvla"
+    CFLAGS="-Werror "
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -23999,9 +23999,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_cflags__Wvla" >&5
 $as_echo "$dpkg_cv_cflags__Wvla" >&6; }
   if test "x$dpkg_cv_cflags__Wvla" = xyes; then :
-
-    as_fn_append COMPILER_CFLAGS " -Wvla"
-
 fi
 
 
@@ -25229,7 +25226,7 @@
 else
 
     dpkg_save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS="-Werror -Wvla"
+    CXXFLAGS="-Werror "
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -25252,9 +25249,6 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $dpkg_cv_cxxflags__Wvla" >&5
 $as_echo "$dpkg_cv_cxxflags__Wvla" >&6; }
   if test "x$dpkg_cv_cxxflags__Wvla" = xyes; then :
-
-    as_fn_append COMPILER_CXXFLAGS " -Wvla"
-
 fi
 
 
Index: lib/dpkg/dpkg-db.h
--- lib/dpkg/dpkg-db.h.orig	2016-11-01 06:16:03.000000000 +0100
+++ lib/dpkg/dpkg-db.h	2016-11-06 12:48:31.356130878 +0100
@@ -27,6 +27,7 @@
 
 #include <stdbool.h>
 #include <stdio.h>
+#include <stdarg.h>
 
 #include <dpkg/macros.h>
 #include <dpkg/varbuf.h>
Index: man/Makefile.in
--- man/Makefile.in.orig	2016-11-06 12:48:31.366068000 +0100
+++ man/Makefile.in	2016-11-06 12:50:24.506424002 +0100
@@ -790,7 +790,7 @@
 
 
 # If the user has not defined it let's use the default.
-LINGUAS ?= $(LINGUAS_DIST)
+LINGUAS =
 
 all-local: all-local-@USE_PO4A@
 
@@ -801,7 +801,7 @@
 # gen-man, that starts recursing infinitely.
 .PHONY: gen-man man-once
 
-gen-man: man.stamp
+gen-man:
 	for lang in $(LINGUAS); do \
 	  files=""; \
 	  for man in $(man_MANS); do \
