diff -u mesa-11.2.1/debian/changelog mesa-11.2.1/debian/changelog
--- mesa-11.2.1/debian/changelog
+++ mesa-11.2.1/debian/changelog
@@ -1,3 +1,9 @@
+mesa (11.2.1-1ubuntu2) UNRELEASED; urgency=medium
+
+  * Enable llvmpipe on arm64.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Fri, 10 Jun 2016 00:58:06 +0000
+
 mesa (11.2.1-1ubuntu1) yakkety; urgency=medium
 
   * Merge from Debian.
diff -u mesa-11.2.1/debian/control mesa-11.2.1/debian/control
--- mesa-11.2.1/debian/control
+++ mesa-11.2.1/debian/control
@@ -42,11 +42,11 @@
  libudev-dev [linux-any],
  flex,
  bison,
- llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
- libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf],
+ llvm-3.8-dev (>= 1:3.8) [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf arm64],
+ libelf-dev [amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf arm64],
  libwayland-dev (>= 1.2.0) [linux-any],
- libclang-3.8-dev (>= 1:3.8) [amd64 i386 armhf],
- libclc-dev (>= 0.2.0+git20150813) [amd64 i386 armhf],
+ libclang-3.8-dev (>= 1:3.8) [amd64 i386 armhf arm64],
+ libclc-dev (>= 0.2.0+git20150813) [amd64 i386 armhf arm64],
  mir-client-platform-mesa-dev,
  libmirclient-dev,
 Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/lib/mesa.git
diff -u mesa-11.2.1/debian/rules mesa-11.2.1/debian/rules
--- mesa-11.2.1/debian/rules
+++ mesa-11.2.1/debian/rules
@@ -80,7 +80,7 @@
     DRI_DRIVERS += r200 radeon
     GALLIUM_DRIVERS += r600 r300
   endif
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf))
+  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 armhf arm64))
 	# opencl needs gallium-pipe-loader which needs udev,
 	# so no opencl on kfreebsd.
 	# opencl needs LLVM and Clang, so only build it on the subset
@@ -89,7 +89,7 @@
   endif
 
   # LLVM is required for r300g, radeonsi and llvmpipe:
-  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf))
+  ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386 kfreebsd-amd64 kfreebsd-i386 armhf arm64))
 	GALLIUM_DRIVERS += radeonsi
 	confflags_GALLIUM += --enable-gallium-llvm
 	confflags_GALLIUM += ac_cv_path_LLVM_CONFIG=llvm-config-3.8