diff --git a/mk/cfg/i586-pc-windows-msvc.mk b/mk/cfg/i586-pc-windows-msvc.mk
new file mode 100644
index 00000000000..da2680f7416
--- /dev/null
+++ b/mk/cfg/i586-pc-windows-msvc.mk
@@ -0,0 +1,28 @@
+# i586-pc-windows-msvc configuration
+CC_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
+LINK_i586-pc-windows-msvc="$(CFG_MSVC_LINK_i386)" -nologo
+CXX_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
+CPP_i586-pc-windows-msvc="$(CFG_MSVC_CL_i386)" -nologo
+AR_i586-pc-windows-msvc="$(CFG_MSVC_LIB_i386)" -nologo
+CFG_LIB_NAME_i586-pc-windows-msvc=$(1).dll
+CFG_STATIC_LIB_NAME_i586-pc-windows-msvc=$(1).lib
+CFG_LIB_GLOB_i586-pc-windows-msvc=$(1)-*.{dll,lib}
+CFG_LIB_DSYM_GLOB_i586-pc-windows-msvc=$(1)-*.dylib.dSYM
+CFG_JEMALLOC_CFLAGS_i586-pc-windows-msvc :=
+CFG_GCCISH_CFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
+CFG_GCCISH_CXXFLAGS_i586-pc-windows-msvc := -MD -arch:IA32
+CFG_GCCISH_LINK_FLAGS_i586-pc-windows-msvc :=
+CFG_GCCISH_DEF_FLAG_i586-pc-windows-msvc :=
+CFG_LLC_FLAGS_i586-pc-windows-msvc :=
+CFG_INSTALL_NAME_i586-pc-windows-msvc =
+CFG_EXE_SUFFIX_i586-pc-windows-msvc := .exe
+CFG_WINDOWSY_i586-pc-windows-msvc := 1
+CFG_UNIXY_i586-pc-windows-msvc :=
+CFG_LDPATH_i586-pc-windows-msvc :=
+CFG_RUN_i586-pc-windows-msvc=$(2)
+CFG_RUN_TARG_i586-pc-windows-msvc=$(call CFG_RUN_i586-pc-windows-msvc,,$(2))
+CFG_GNU_TRIPLE_i586-pc-windows-msvc := i586-pc-win32
+
+# Currently the build system is not configured to build jemalloc
+# with MSVC, so we omit this optional dependency.
+CFG_DISABLE_JEMALLOC_i586-pc-windows-msvc := 1
diff --git a/src/librustc_back/target/i586_pc_windows_msvc.rs b/src/librustc_back/target/i586_pc_windows_msvc.rs
new file mode 100644
index 00000000000..12bed370eae
--- /dev/null
+++ b/src/librustc_back/target/i586_pc_windows_msvc.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+use target::Target;
+
+pub fn target() -> Target {
+    let mut base = super::i686_pc_windows_msvc::target();
+    base.options.cpu = "pentium".to_string();
+    base.llvm_target = "i586-pc-windows-msvc".to_string();
+    return base
+}
diff --git a/src/librustc_back/target/i586_unknown_linux_gnu.rs b/src/librustc_back/target/i586_unknown_linux_gnu.rs
index 42d5674a2c8..6eb64556381 100644
--- a/src/librustc_back/target/i586_unknown_linux_gnu.rs
+++ b/src/librustc_back/target/i586_unknown_linux_gnu.rs
@@ -11,18 +11,8 @@
 use target::Target;
 
 pub fn target() -> Target {
-    let mut base = super::linux_base::opts();
-    base.cpu = "pentium".to_string();
-    base.pre_link_args.push("-m32".to_string());
-
-    Target {
-        llvm_target: "i586-unknown-linux-gnu".to_string(),
-        target_endian: "little".to_string(),
-        target_pointer_width: "32".to_string(),
-        arch: "x86".to_string(),
-        target_os: "linux".to_string(),
-        target_env: "gnu".to_string(),
-        target_vendor: "unknown".to_string(),
-        options: base,
-    }
+    let mut base = super::i686_unknown_linux_gnu::target();
+    base.options.cpu = "pentium".to_string();
+    base.llvm_target = "i586-unknown-linux-gnu".to_string();
+    return base
 }
diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs
index e0743c339ce..266144f61de 100644
--- a/src/librustc_back/target/mod.rs
+++ b/src/librustc_back/target/mod.rs
@@ -136,6 +136,7 @@ fn load_specific(target: &str) -> Option<Target> {
 
     ("x86_64-pc-windows-msvc", x86_64_pc_windows_msvc),
     ("i686-pc-windows-msvc", i686_pc_windows_msvc),
+    ("i586-pc-windows-msvc", i586_pc_windows_msvc),
 
     ("le32-unknown-nacl", le32_unknown_nacl),
     ("asmjs-unknown-emscripten", asmjs_unknown_emscripten)