diff --git a/debian/changelog b/debian/changelog
index b33802fa..bfdd70b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+llvm-toolchain-3.8 (1:3.8.1-5) UNRELEASED; urgency=medium
+
+  * Try to fix mips64el build, by enabling the same
+    packages as the mips and mipsel versions
+
+ -- Gianfranco Costamagna <locutusofborg@debian.org>  Fri, 22 Jul 2016 18:40:42 +0200
+
 llvm-toolchain-3.8 (1:3.8.1-4) unstable; urgency=medium
 
   * Fix the FTBFS under mips/mipsel? (enable the link against atomic)
diff --git a/debian/control b/debian/control
index ed825739..3e6a7056 100644
--- a/debian/control
+++ b/debian/control
@@ -371,8 +371,8 @@ Description: Modular compiler and toolchain technologies, examples
 # ------------- lldb -------------
 
 Package: lldb-3.8
-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 i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version}), llvm-3.8-dev
 Suggests: python-lldb-3.8
 Conflicts: lldb-3.4, lldb-3.5
@@ -383,8 +383,8 @@ Description: Next generation, high-performance debugger
  Project, such as the Clang expression parser and LLVM disassembler.
 
 Package: liblldb-3.8
-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 i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: libs
@@ -398,8 +398,8 @@ Description: Next generation, high-performance debugger, library
  This package contains the LLDB runtime library.
 
 Package: liblldb-3.8-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 i386  kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel mips64el
+# ia64 hurd ppc64el alpha s390x powerpc have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8 (= ${binary:Version})
 Pre-Depends: ${misc:Pre-Depends}
 Section: debug
@@ -414,7 +414,7 @@ Description: Next generation, high-performance debugger, debugging libraries
 
 Package: python-lldb-3.8
 Section: python
-Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel
+Architecture: amd64 armel armhf i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel mips64el
 Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8-dev, python, python-six
 Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
 Pre-Depends: ${misc:Pre-Depends}
@@ -428,8 +428,8 @@ Description: Next generation, high-performance debugger, python lib
 
 Package: liblldb-3.8-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 i386 kfreebsd-amd64 kfreebsd-i386 s390 sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 mips mipsel mips64el
+# ia64 hurd powerpc ppc64el have been removed
 Depends: ${shlibs:Depends}, ${misc:Depends}, lldb-3.8 (= ${binary:Version})
 Replaces: lldb-3.8-dev (<= 1:3.8~svn215195-2)
 Breaks: lldb-3.8-dev (<< 1:3.8~svn215195-2)
diff --git a/debian/rules b/debian/rules
index bf244de4..d923ff03 100755
--- a/debian/rules
+++ b/debian/rules
@@ -34,7 +34,7 @@ CXXFLAGS_EXTRA = -std=c++0x -gsplit-dwarf
 CONFIGURE_EXTRA =
 CMAKE_EXTRA =
 
-ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe mips mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe mips mipsel mips64el))
 LDFLAGS_EXTRA += -latomic
 endif