diff --git a/debian/changelog b/debian/changelog
index 9a199072..aaab5b70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ llvm-toolchain-snapshot (1:6.0~svn309319-1) unstable; urgency=medium
   * We moved from 5.0 to 6.0
   * Ship the opt-viewer new program as part of llvm-5.0 tools
   * ld.lld manpage wasn't installed
+  * Disable the clang-fix-cmpxchg8-detection-on-i386.patch patch
+    because breaks the build with 
+    'error: 'isCmpXChg8Supported' was not declared in this scope'
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 27 Jul 2017 23:16:06 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index d679ac3b..4749a4d7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,7 +36,7 @@ clang-tidy-run-bin.diff
 #bug-30342.diff
 fix-scan-view-path.diff
 #0011-SimplifyCFG-Hoisting-invalidates-metadata.patch
-clang-fix-cmpxchg8-detection-on-i386.patch
+#clang-fix-cmpxchg8-detection-on-i386.patch
 lldb-addversion-suffix-to-llvm-server-exec.patch
 lldb-missing-install.diff
 silent-test-failing-codeverage.diff