diff --git a/debian/changelog b/debian/changelog
index e6cf8281b3..4a5e714b62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 rustc (1.28.0+dfsg1-3) UNRELEASED; urgency=medium
 
+  [ Ximin Luo ]
   * More sparc64 fixes, and increase allowed-test-failures there to 180.
 
+  [ Julien Cristau ]
+  * Don't use pentium4 as i686 baseline (closes: #908561)
+
  -- Ximin Luo <infinity0@debian.org>  Mon, 13 Aug 2018 20:31:31 -0700
 
 rustc (1.28.0+dfsg1-2) unstable; urgency=medium
diff --git a/debian/patches/d-i686-baseline.patch b/debian/patches/d-i686-baseline.patch
new file mode 100644
index 0000000000..2038344501
--- /dev/null
+++ b/debian/patches/d-i686-baseline.patch
@@ -0,0 +1,13 @@
+diff --git a/src/librustc_target/spec/i686_unknown_linux_gnu.rs b/src/librustc_target/spec/i686_unknown_linux_gnu.rs
+index c3ff34788..80b296980 100644
+--- a/src/librustc_target/spec/i686_unknown_linux_gnu.rs
++++ b/src/librustc_target/spec/i686_unknown_linux_gnu.rs
+@@ -12,7 +12,7 @@ use spec::{LinkerFlavor, Target, TargetResult};
+ 
+ pub fn target() -> TargetResult {
+     let mut base = super::linux_base::opts();
+-    base.cpu = "pentium4".to_string();
++    base.cpu = "pentiumpro".to_string();
+     base.max_atomic_width = Some(64);
+     base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m32".to_string());
+     base.stack_probes = true;
diff --git a/debian/patches/series b/debian/patches/series
index 50e1ffe4d3..58f518d581 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -37,6 +37,7 @@ d-ignore-removed-submodules.patch
 d-armel-disable-kernel-helpers.patch
 d-read-beta-version-from-file.patch
 d-ignore-impl-generic-mismatch-diff.patch
+d-i686-baseline.patch
 
 d-no-web-dependencies-in-doc.patch
 # Work around for some porterboxes, keep this commented