diff --git a/debian/changelog b/debian/changelog
index cb8035d8..38a60d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ 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
+  * Link mips* with latomic.
   * Disable lldb on sparc64 (Closes: #832371)
   * Hopefully fix the FTBFS on armel
 
diff --git a/debian/patches/lldb-link-atomic-cmake.patch b/debian/patches/lldb-link-atomic-cmake.patch
new file mode 100644
index 00000000..dced0f06
--- /dev/null
+++ b/debian/patches/lldb-link-atomic-cmake.patch
@@ -0,0 +1,19 @@
+Description: Link with -latomic when mips* processor is detected
+Author: Gianfranco Costamagna <locutusofborg@debian.org>
+Last-Update: 2016-07-27
+
+--- llvm-toolchain-3.8-3.8.1.orig/lldb/cmake/LLDBDependencies.cmake
++++ llvm-toolchain-3.8-3.8.1/lldb/cmake/LLDBDependencies.cmake
+@@ -172,6 +172,12 @@ if (LLVM_BUILD_STATIC)
+   endif()
+ endif()
+ 
++if(CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mipsel" OR
++   CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "mips64el")
++  list(APPEND LLDB_SYSTEM_LIBS atomic)
++endif()
++
+ set( LLVM_LINK_COMPONENTS
+   ${LLVM_TARGETS_TO_BUILD}
+   interpreter
diff --git a/debian/patches/series b/debian/patches/series
index 96d0ea2d..f656795f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -41,3 +41,4 @@ llvm25468-lldb-swig-format-security.diff
 llvm26003-sanitizer-check-env.diff
 scan-view-fix-path.diff
 mips-fpxx-enable.diff
+lldb-link-atomic-cmake.patch