diff --git a/debian/changelog b/debian/changelog
index 519c0335..88245aec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,10 @@ llvm-toolchain-6.0 (1:6.0.1-8) unstable; urgency=medium
   * Add s390x to polly architectures
   * Fix typo in rules file
 
- -- John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>  Wed, 12 Sep 2018 10:48:35 +0200
+  [ Sylvestre Ledru ]
+  * Disable sse2 on pentium4 arch (Closes: #632472)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 13 Sep 2018 10:04:42 +0200
 
 llvm-toolchain-6.0 (1:6.0.1-7) unstable; urgency=medium
 
diff --git a/debian/patches/disable-sse2-old-x86.diff b/debian/patches/disable-sse2-old-x86.diff
new file mode 100644
index 00000000..b84a4e29
--- /dev/null
+++ b/debian/patches/disable-sse2-old-x86.diff
@@ -0,0 +1,12 @@
+Index: llvm-toolchain-6.0-6.0.1/clang/lib/Basic/Targets/X86.cpp
+===================================================================
+--- llvm-toolchain-6.0-6.0.1.orig/clang/lib/Basic/Targets/X86.cpp
++++ llvm-toolchain-6.0-6.0.1/clang/lib/Basic/Targets/X86.cpp
+@@ -207,7 +207,6 @@ bool X86TargetInfo::initFeatureMap(
+     setFeatureEnabledImpl(Features, "cx16", true);
+     LLVM_FALLTHROUGH;
+   case CK_PentiumM:
+-  case CK_Pentium4:
+   case CK_x86_64:
+     setFeatureEnabledImpl(Features, "sse2", true);
+     LLVM_FALLTHROUGH;
diff --git a/debian/patches/series b/debian/patches/series
index 533ea6c5..ea72f347 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -66,3 +66,4 @@ D51335-alignment-issue.diff
 # Doesn't fully apply
 # D51639-optim-issue.diff
 rL338481-cherry-pick-really-subtle-miscompile.diff
+disable-sse2-old-x86.diff