diff --git a/debian/changelog b/debian/changelog
index e03f2f5..429bd12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+beignet (1.3.0-2ubuntu1) zesty; urgency=medium
+
+  * Use LLVM 3.9 unconditionally instead of trying to match mesa,
+    as this package FTBFS with LLVM 4.0. (LP: #1668024)
+
+ -- Rebecca N. Palmer <rebecca_palmer@zoho.com>  Sun, 26 Feb 2017 13:25:03 +0000
+
 beignet (1.3.0-2) unstable; urgency=medium
 
   * Statically link to LLVM to allow installation together with
diff --git a/debian/rules b/debian/rules
index 302dd30..b81ed5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,11 +13,7 @@ export DEB_CPPFLAGS_MAINT_APPEND = -DGBE_DEBUG=1
 # We build with the headers from opencl-headers.
 SUPERFLUOUS=cl.h cl_d3d10.h cl_dx9_media_sharing.h cl_ext.h cl_gl_ext.h cl_platform.h cl.hpp cl_d3d11.h cl_egl.h cl_gl.h opencl.h
 
-# Use the same LLVM version as mesa (build will fail if this version is not available; this is intentional, as mixing versions may cause crashes)
-# http://lists.alioth.debian.org/pipermail/pkg-opencl-devel/Week-of-Mon-20160418/000963.html
-LLVM_VERSION_MESA	:= $(shell dpkg-query -f '$${Depends} \n' -W libgl1-mesa-dri:$(DEB_HOST_ARCH) | sed -r 's/.*libllvm([0-9.]+).*/\1/p;d')
-LLVM_VERSION_DEFAULT	 = 3.9
-LLVM_VERSION		 = $(or $(LLVM_VERSION_MESA),$(LLVM_VERSION_DEFAULT))
+LLVM_VERSION		 = 3.9
 #this looks the wrong way round because --compare-versions uses success=0 and we need on=1
 CAN_ENABLE_OPENCL2	:= $(if $(findstring amd64,$(DEB_HOST_ARCH)),$(shell dpkg --compare-versions $(LLVM_VERSION) lt 3.9 || dpkg --compare-versions `dpkg-query -f '$${Version}' -W libdrm-dev:$(DEB_HOST_ARCH)` lt 2.4.66 ; echo $$?),0)