diff --git a/debian/changelog b/debian/changelog
index 9d7ad07e..d9e15d5c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,7 +7,9 @@ llvm-toolchain-3.3 (1:3.3-9) UNRELEASED; urgency=low
   [ Sylvestre Ledru ]
   * Only use -fuse-ld=gold on supported distribution. Simplify the
     backports.
-  * Add more fixes for the HURD port...
+  * Fix  'bits/c++config.h' file not found under i386
+    See libstdc++-header-i386.diff. (Closes: #714890)
+  * Add more fixes for the HURD port... (but still fails)
 
   [ Jon Severinsson ]
   * Merge from llvm-toolchain-3.2 branch up to 3.2repack-11.
diff --git a/debian/patches/libstdc++-header-i386.diff b/debian/patches/libstdc++-header-i386.diff
new file mode 100644
index 00000000..b157f4da
--- /dev/null
+++ b/debian/patches/libstdc++-header-i386.diff
@@ -0,0 +1,15 @@
+Index: llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp
+===================================================================
+--- llvm-toolchain-3.3-3.3.orig/clang/lib/Driver/ToolChains.cpp	2013-09-03 14:04:41.000000000 +0000
++++ llvm-toolchain-3.3-3.3/clang/lib/Driver/ToolChains.cpp	2013-09-04 14:09:12.000000000 +0000
+@@ -2588,6 +2588,10 @@
+   StringRef Version = GCCInstallation.getVersion().Text;
+   StringRef TripleStr = GCCInstallation.getTriple().str();
+ 
++  #ifdef __i386__
++  // clang does not detect this path: /usr/include/i386-linux-gnu/c++/4.8/ Help him
++  addLibStdCXXIncludePaths( "/usr/include/", "/c++/" + Version.str(), "i386-linux-gnu", GCCInstallation.getMultiarchSuffix(), DriverArgs, CC1Args);
++  #endif
+   if (addLibStdCXXIncludePaths(LibDir.str() + "/../include", 
+                                "/c++/" + Version.str(),
+                                TripleStr,
diff --git a/debian/patches/series b/debian/patches/series
index 0bd98168..eb0f56b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -33,4 +33,4 @@ unwind-chain-inclusion.diff
 hurd-pathmax.diff
 libprofile_rt_sparc.patch
 lldb-hurd.diff
-lldb-link-atomic.diff
+libstdc++-header-i386.diff