diff --git a/0001-cmd-rework-header-check-for-xfs-xqm.patch b/0001-cmd-rework-header-check-for-xfs-xqm.patch
new file mode 100644
index 0000000..685c8e7
--- /dev/null
+++ b/0001-cmd-rework-header-check-for-xfs-xqm.patch
@@ -0,0 +1,38 @@
+From 7b98edae011aab645b2db523cb243ee0184e4c95 Mon Sep 17 00:00:00 2001
+From: Simon Fels <simon.fels@canonical.com>
+Date: Mon, 27 Mar 2017 14:18:41 +0200
+Subject: [PATCH] cmd: rework header check for xfs/xqm.h
+
+Building snap-confine on i386 fails on other operating systems with:
+
+configure: WARNING: xfs/xqm.h: present but cannot be compiled
+configure: WARNING: xfs/xqm.h:     check for missing prerequisite headers?
+configure: WARNING: xfs/xqm.h: see the Autoconf documentation
+configure: WARNING: xfs/xqm.h:     section "Present But Cannot Be Compiled"
+configure: WARNING: xfs/xqm.h: proceeding with the compiler's result
+[...]
+checking for xfs/xqm.h... no
+configure: error: xfs/xqm.h unavailable
+
+The official autoconf documentation recommends using a proper include
+check in the AC_CHECK_HEADERS macro.
+---
+ cmd/configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/cmd/configure.ac b/cmd/configure.ac
+index 619ef42..981def6 100644
+--- a/cmd/configure.ac
++++ b/cmd/configure.ac
+@@ -22,7 +22,10 @@ AC_SYS_LARGEFILE
+ # Checks for header files.
+ AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/mount.h unistd.h])
+ AC_CHECK_HEADERS([sys/quota.h], [], [AC_MSG_ERROR(sys/quota.h unavailable)])
+-AC_CHECK_HEADERS([xfs/xqm.h],   [], [AC_MSG_ERROR(xfs/xqm.h unavailable)])
++AC_CHECK_HEADERS([xfs/xqm.h], [], [AC_MSG_ERROR(xfs/xqm.h unavailable)],
++[[#define _FILE_OFFSET_BITS 64
++#include <xfs/xqm.h>
++]])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_CHECK_HEADER_STDBOOL
diff --git a/snapd.spec b/snapd.spec
index 96ea50c..5407823 100644
--- a/snapd.spec
+++ b/snapd.spec
@@ -62,6 +62,8 @@ Patch0007:      0007-osutil-HACK-use-usr-bin-true-false.patch
 Patch0008:      0008-partition-skip-some-tests-if-grub-editenv-is-not-ava.patch
 # Upstream merged: https://github.com/snapcore/snapd/pull/3081
 Patch0009:      0001-data-selinux-Add-context-definition-for-snapctl.patch
+# Upstream merged: https://github.com/snapcore/snapd/pull/3094
+Patch0010:      0001-cmd-rework-header-check-for-xfs-xqm.patch
 
 # Upstream proposed PR: https://github.com/snapcore/snapd/pull/3084
 Patch1001:      PR3084-packaging-use-templates-for-systemd-units.patch
@@ -550,6 +552,7 @@ fi
 - Rebase to snapd 2.23.6
 - Rediff patches
 - Re-enable seccomp
+- Fix building snap-confine on 32-bit arches
 
 * Wed Mar 29 2017 Neal Gompa <ngompa13@gmail.com> - 2.23.5-1
 - Rebase to snapd 2.23.5