diff --git a/debian/changelog b/debian/changelog
index 9bc01237..e5333241 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ llvm-toolchain-snapshot (1:3.9~svn273256-1~exp1) UNRELEASED; urgency=medium
     pointing to usr/share/llvm-3.9/cmake
   * Disable the run of lldb testsuite because of LLVM_LINK_LLVM_DYLIB=ON:
      https://llvm.org/bugs/show_bug.cgi?id=28127
+  * Disable lldb on i386 (cannot link). This is probably temporary
 
   [ YunQiang Su ]
   * Enable FPXX by default on mips/mipsel (Closes: #826749)
diff --git a/debian/control b/debian/control
index 0615965a..9b8c52c3 100644
--- a/debian/control
+++ b/debian/control
@@ -406,8 +406,8 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lldb -------------
 
 Package: lldb-3.9
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
-# ia64 mips mipsel hurd powerpc ppc64el have been removed
+Architecture: amd64 armel armhf  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+# ia64 mips mipsel hurd powerpc ppc64el i386 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version}), llvm-3.9-dev
 Suggests: python-lldb-3.9
 Conflicts: lldb-3.4, lldb-3.5
@@ -418,8 +418,8 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-3.9
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
-# ia64 mips mipsel hurd powerpc ppc64el have been removed
+Architecture: amd64 armel armhf  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+# ia64 mips mipsel hurd powerpc ppc64el i386 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.9 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -433,8 +433,8 @@ Description: Next generation, high-performance debugger, library
  This package contains the LLDB runtime library.
 
 Package: liblldb-3.9-dbg
-Architecture: amd64 armel armhf i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
-# ia64 mips mipsel hurd ppc64el alpha s390x powerpc have been removed
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+# ia64 mips mipsel hurd ppc64el alpha s390x i386 powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.9 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: debug
@@ -463,8 +463,8 @@ Description: Next generation, high-performance debugger, python lib
 
 Package: liblldb-3.9-dev
 Section: libdevel
-Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
-# ia64 mips mipsel hurd powerpc ppc64el have been removed
+Architecture: amd64 armel armhf kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+# ia64 mips mipsel hurd powerpc ppc64el i386 have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.9 (= ${binary:Version})
 Replaces: lldb-3.9-dev (<= 1:3.9~svn215195-2)
 Breaks: lldb-3.9-dev (<< 1:3.9~svn215195-2)
diff --git a/debian/rules b/debian/rules
index daec0bfd..d68e74eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -108,7 +108,7 @@ endif
 
 
 LLDB_ENABLE=yes
-LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x
+LLDB_DISABLE_ARCHS := arm64 hurd-i386 ia64 ppc64el powerpc s390x i386
 # hurd has threading issues
 ifeq (,$(filter-out $(LLDB_DISABLE_ARCHS), $(DEB_HOST_ARCH)))
 # Disable LLDB for this arch.
@@ -213,7 +213,6 @@ override_dh_auto_configure: preconfigure
 	-DCMAKE_VERBOSE_MAKEFILE=ON \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 	-DCMAKE_CXX_FLAGS='$(CXXFLAGS_EXTRA)' \
-	-DLLVM_LINK_LLVM_DYLIB=ON \
 	-DLLVM_VERSION_SUFFIX= \
 	-DLLVM_ENABLE_SPHINX=ON \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \