diff --git a/src/librustc_target/spec/windows_base.rs b/src/librustc_target/spec/windows_base.rs
index 34fcdf251b89b..392b9f4999143 100644
--- a/src/librustc_target/spec/windows_base.rs
+++ b/src/librustc_target/spec/windows_base.rs
@@ -57,9 +57,9 @@ pub fn opts() -> TargetOptions {
             // binaries to be redistributed without the libgcc_s-dw2-1.dll
             // dependency, but unfortunately break unwinding across DLL
             // boundaries when unwinding across FFI boundaries.
-            "-lgcc".to_string(),
             "-lgcc_eh".to_string(),
-            "-lpthread".to_string(),
+            "-l:libpthread.a".to_string(),
+            "-lgcc".to_string(),
             // libpthread depends on libmsvcrt, so we need to link it *again*.
             "-lmsvcrt".to_string(),
             "-lkernel32".to_string(),
diff --git a/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile b/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile
new file mode 100644
index 0000000000000..f6adb6d76279d
--- /dev/null
+++ b/src/test/run-make-fulldeps/windows-binary-no-external-deps/Makefile
@@ -0,0 +1,9 @@
+-include ../tools.mk
+
+# only-windows
+
+PATH=$(SYSTEMROOT)/system32
+
+all:
+	$(RUSTC) hello.rs
+	$(TMPDIR)/hello.exe
diff --git a/src/test/run-make-fulldeps/windows-binary-no-external-deps/hello.rs b/src/test/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
new file mode 100644
index 0000000000000..47ad8c634112b
--- /dev/null
+++ b/src/test/run-make-fulldeps/windows-binary-no-external-deps/hello.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello World!");
+}