diff --git a/.gitignore b/.gitignore
index fc75775eea..e79e32ecbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 typescript
+debian.series
 *.img
 *.initrd
 *.tar.gz
diff --git a/kernel/update.sh b/kernel/update.sh
index 85f05fec23..e27471ecd9 100755
--- a/kernel/update.sh
+++ b/kernel/update.sh
@@ -27,7 +27,7 @@ KR_PATCHES=$(eval find "patches" -type f -name "*.patch")
 KR_REL=https://www.kernel.org/releases.json
 KR_SHA=https://cdn.kernel.org/pub/linux/kernel/v"${KR_SERIES}"/sha256sums.asc
 
-GENERATED_FILES=(kata-linux-container.dsc kata-linux-container.spec _service config debian.control debian.series)
+GENERATED_FILES=(kata-linux-container.dsc kata-linux-container.spec _service config debian.control)
 STATIC_FILES=(debian.dirs debian.rules debian.compat debian.copyright)
 #STATIC_FILES+=($KR_PATCHES)
 
diff --git a/qemu-lite/debian.series b/qemu-lite/debian.series
deleted file mode 100644
index 37a4b42100..0000000000
--- a/qemu-lite/debian.series
+++ /dev/null
@@ -1 +0,0 @@
-configure.patch
diff --git a/qemu-lite/patches/0001-memfd-fix-configure-test.patch b/qemu-lite/patches/0001-memfd-fix-configure-test.patch
new file mode 100644
index 0000000000..b1f354ac1c
--- /dev/null
+++ b/qemu-lite/patches/0001-memfd-fix-configure-test.patch
@@ -0,0 +1,55 @@
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a..99ccc17 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1a..412e94a 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+1.8.3.1
+
diff --git a/qemu-vanilla/debian.series b/qemu-vanilla/debian.series
deleted file mode 100644
index 37a4b42100..0000000000
--- a/qemu-vanilla/debian.series
+++ /dev/null
@@ -1 +0,0 @@
-configure.patch
diff --git a/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch b/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch
new file mode 100644
index 0000000000..b1f354ac1c
--- /dev/null
+++ b/qemu-vanilla/patches/0001-memfd-fix-configure-test.patch
@@ -0,0 +1,55 @@
+From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Tue, 28 Nov 2017 11:51:27 +0100
+Subject: [PATCH] memfd: fix configure test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Recent glibc added memfd_create in sys/mman.h.  This conflicts with
+the definition in util/memfd.c:
+
+    /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
+
+Fix the configure test, and remove the sys/memfd.h inclusion since the
+file actually does not exist---it is a typo in the memfd_create(2) man
+page.
+
+Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ configure    | 2 +-
+ util/memfd.c | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/configure b/configure
+index 9c8aa5a..99ccc17 100755
+--- a/configure
++++ b/configure
+@@ -3923,7 +3923,7 @@ fi
+ # check if memfd is supported
+ memfd=no
+ cat > $TMPC << EOF
+-#include <sys/memfd.h>
++#include <sys/mman.h>
+ 
+ int main(void)
+ {
+diff --git a/util/memfd.c b/util/memfd.c
+index 4571d1a..412e94a 100644
+--- a/util/memfd.c
++++ b/util/memfd.c
+@@ -31,9 +31,7 @@
+ 
+ #include "qemu/memfd.h"
+ 
+-#ifdef CONFIG_MEMFD
+-#include <sys/memfd.h>
+-#elif defined CONFIG_LINUX
++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
+ #include <sys/syscall.h>
+ #include <asm/unistd.h>
+ 
+-- 
+1.8.3.1
+
diff --git a/scripts/pkglib.sh b/scripts/pkglib.sh
index c1031df258..4911800fbc 100644
--- a/scripts/pkglib.sh
+++ b/scripts/pkglib.sh
@@ -349,4 +349,5 @@ function find_patches() {
 		echo "$p" >> debian.series
 		((n++))
 	done
+	GENERATED_FILES+=(debian.series)
 }