diff --git a/debian/changelog b/debian/changelog
index e4ea455f..90efeb0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp3) UNRELEASED; urgency=medium
+
+  * d/p/force-gcc-header-obj.diff Fix the detection of the objc path
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 09 May 2018 14:23:49 +0200
+
 llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp2) experimental; urgency=medium
 
   * Add python-yaml as dep for clang-tidy (Closes: #890514)
diff --git a/debian/patches/force-gcc-header-obj.diff b/debian/patches/force-gcc-header-obj.diff
index bcd2cbd1..e47d28c3 100644
--- a/debian/patches/force-gcc-header-obj.diff
+++ b/debian/patches/force-gcc-header-obj.diff
@@ -1,15 +1,15 @@
-Index: llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp
+Index: llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
 ===================================================================
---- llvm-toolchain-snapshot_3.5~svn201651.orig/clang/lib/Driver/ToolChains.cpp	2014-02-19 09:46:43.433569829 +0100
-+++ llvm-toolchain-snapshot_3.5~svn201651/clang/lib/Driver/ToolChains.cpp	2014-02-19 09:46:45.621708435 +0100
-@@ -3078,6 +3078,11 @@
+--- llvm-toolchain-5.0-5.0.2~+rc1.orig/clang/lib/Driver/ToolChains/Linux.cpp
++++ llvm-toolchain-5.0-5.0.2~+rc1/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -571,6 +571,11 @@ void Linux::AddClangSystemIncludeArgs(co
      return;
    }
  
 +  // Force the inclusion of the gcc headers (objc/objc.h)
 +  addExternCSystemIncludeIfExists(
 +     DriverArgs, CC1Args, GCCInstallation.getInstallPath() + "/include");
-+
++//  std::cout << GCCInstallation.getInstallPath().str() << "/include" << std::endl;
 +
    // Lacking those, try to detect the correct set of system includes for the
    // target triple.
diff --git a/debian/patches/series b/debian/patches/series
index 2f9d8dcc..4fb8d616 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,7 @@ silent-gold-test.diff
 atomic_library_1.diff
 python-clangpath.diff
 fix-clang-path-and-build.diff
-#force-gcc-header-obj.diff
+force-gcc-header-obj.diff
 do-not-fail-on-unexpected-pass.diff
 silent-more-tests.diff
 disable-display-PASS-UNSUPPORTED-XFAIL.diff
diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 162c06fb..e8bd3d27 100644
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -277,7 +277,8 @@ for SYSTEM in ""; do
 done
 
 echo "If the following fails, try setting an environment variable such as:"
-echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/5/include"
+echo "OBJC_INCLUDE_PATH=/usr/lib/gcc/x86_64-linux-gnu/7/include"
+echo "libobjc-7-dev should be also installed"
 echo "#include <objc/objc.h>" > foo.m
 clang-$VERSION -c foo.m