diff -Nru octave-3.8.0/debian/changelog octave-3.8.0/debian/changelog
--- octave-3.8.0/debian/changelog	2014-03-12 14:35:26.000000000 +0000
+++ octave-3.8.0/debian/changelog	2014-04-07 16:19:12.000000000 +0000
@@ -1,3 +1,9 @@
+octave (3.8.0-5ubuntu6) trusty; urgency=medium
+
+  * Disable JIT on all archs to fix LLVM library conflicts. (LP: #1293876)
+
+ -- Mike Miller <mtmiller@debian.org>  Mon, 07 Apr 2014 11:19:12 -0500
+
 octave (3.8.0-5ubuntu5) trusty; urgency=medium
 
   * Fix installing packages where dependency name contains '-'. (LP: #1288136)
diff -Nru octave-3.8.0/debian/control octave-3.8.0/debian/control
--- octave-3.8.0/debian/control	2014-03-12 14:35:26.000000000 +0000
+++ octave-3.8.0/debian/control	2014-04-07 16:19:06.000000000 +0000
@@ -15,7 +15,7 @@
  libqhull-dev, desktop-file-utils, libfltk1.3-dev, libgl2ps-dev,
  libgraphicsmagick++1-dev, libftgl-dev, libfontconfig1-dev,
  libqrupdate-dev, libarpack2-dev (>= 2.1+parpack96.dfsg-2), dh-exec,
- dpkg-dev (>= 1.16.1), llvm-3.3-dev [!arm64 !armel !armhf !mips !mipsel !powerpc !ppc64el],
+ dpkg-dev (>= 1.16.1),
  default-jdk, libqscintilla2-dev, libxft-dev, javahelper
 Standards-Version: 3.9.5
 Homepage: http://www.octave.org/
diff -Nru octave-3.8.0/debian/NEWS octave-3.8.0/debian/NEWS
--- octave-3.8.0/debian/NEWS	2014-03-12 14:35:26.000000000 +0000
+++ octave-3.8.0/debian/NEWS	2014-04-07 16:19:06.000000000 +0000
@@ -9,9 +9,4 @@
     interface, there is the `octave-cli' executable which is not linked
     against Qt.
 
-  * Starting with this version, Octave incorporates a just-in-time (JIT)
-    compiler, which can offer performance improvements in some situations.
-    Since it is still experimental, the JIT is disabled by default, but
-    you can activate it with the `jit_enable' command.
-
  -- Sébastien Villemot <sebastien@debian.org>  Fri, 20 Dec 2013 20:47:36 +0100
diff -Nru octave-3.8.0/debian/rules octave-3.8.0/debian/rules
--- octave-3.8.0/debian/rules	2014-03-12 14:35:26.000000000 +0000
+++ octave-3.8.0/debian/rules	2014-04-07 16:19:06.000000000 +0000
@@ -30,15 +30,10 @@
 WITH_JAVA_FLAGS := --with-java-homedir=$(JAVA_HOME) --with-java-libdir=$(JAVA_LIBDIR)
 endif
 
-# Disable the JIT on some archs. JIT unit tests with LLVM currently segfault
-# on those. This arch list must be kept in sync with the arch
-# list qualifying llvm-dev in debian/control.
-NO_JIT_ARCHS := arm64 armel armhf mips mipsel powerpc ppc64el
-ifneq (,$(filter $(DEB_HOST_ARCH),$(NO_JIT_ARCHS)))
-DISABLE_JIT_FLAG := --disable-jit
-endif
-
-export LLVM_CONFIG = llvm-config-3.3
+# Disable the experimental JIT unconditionally for now. The LLVM library
+# interface is unstable. Linking with LLVM may also cause conflicts with other
+# libraries, for example the mesa graphics stack which also uses LLVM.
+JIT_FLAG := --disable-jit
 
 %:
 	dh $@ --with autoreconf --parallel
@@ -48,7 +43,7 @@
 
 # override normal dh_auto_configure call to pass OpenMP flag to it (#631831)
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(DISABLE_JIT_FLAG)
+	dh_auto_configure -- --enable-openmp $(WITH_JAVA_FLAGS) $(JIT_FLAG)
 
 # dh_auto_test tries to run "make test", so override it
 override_dh_auto_test: