diff --git a/debian/changelog b/debian/changelog
index e4a2364f..ea79bb48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-5.0 (1:5.0~+rc2-2) unstable; urgency=medium
 
   * Link LLDB with -latomic on powerpcspe (Closes: #872267)
+  * Fix the C++ include path order (Closes: #859083)
   * Take an ugly workaround to build with gcc 7
     See https://bugs.llvm.org/show_bug.cgi?id=34140
 
diff --git a/debian/patches/fix-clang-path-and-build.diff b/debian/patches/fix-clang-path-and-build.diff
index 61e9ab75..c566bcc3 100644
--- a/debian/patches/fix-clang-path-and-build.diff
+++ b/debian/patches/fix-clang-path-and-build.diff
@@ -2,24 +2,15 @@
  clang/lib/Driver/ToolChains.cpp |    2 ++
  1 file changed, 2 insertions(+)
 
-Index: llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp
+Index: llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
 ===================================================================
---- llvm-toolchain-snapshot_5.0~svn297449.orig/clang/lib/Driver/ToolChains/Gnu.cpp
-+++ llvm-toolchain-snapshot_5.0~svn297449/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -15,6 +15,7 @@
- #include "Arch/SystemZ.h"
- #include "CommonArgs.h"
- #include "clang/Basic/VirtualFileSystem.h"
-+#include "clang/Basic/Version.h"
- #include "clang/Config/config.h" // for GCC_INSTALL_PREFIX
- #include "clang/Driver/Compilation.h"
- #include "clang/Driver/Driver.h"
-@@ -2306,6 +2307,8 @@ void Generic_GCC::AddClangCXXStdlibInclu
-       DriverArgs.hasArg(options::OPT_nostdincxx))
-     return;
- 
+--- llvm-toolchain-4.0-4.0~+rc2.orig/clang/lib/Driver/ToolChains.cpp
++++ llvm-toolchain-4.0-4.0~+rc2/clang/lib/Driver/ToolChains.cpp
+@@ -2952,6 +2952,7 @@ void Generic_GCC::AddClangCXXStdlibInclu
+     addLibStdCxxIncludePaths(DriverArgs, CC1Args);
+     break;
+   }
 +  addSystemInclude(DriverArgs, CC1Args, "/usr/include/clang/" + std::string(CLANG_VERSION_STRING) + "/include/");
-+
-   switch (GetCXXStdlibType(DriverArgs)) {
-   case ToolChain::CST_Libcxx: {
-     std::string Path = findLibCxxIncludePath();
+ }
+ 
+ std::string Generic_GCC::findLibCxxIncludePath() const {