diff --git a/tools/llvm-ld/llvm-ld.cpp b/tools/llvm-ld/llvm-ld.cpp
index 6657c7c..f15281d 100644
--- a/tools/llvm-ld/llvm-ld.cpp
+++ b/tools/llvm-ld/llvm-ld.cpp
@@ -403,7 +403,11 @@
   if (llvmstub.isEmpty())
     PrintAndExit("Could not find llvm-stub.exe executable!");
 
-  if (0 != sys::CopyFile(sys::Path(OutputFilename), llvmstub, &ErrMsg))
+  sys::Path OutPath(OutputFilename);
+  if (OutPath.getSuffix() != "exe")
+    OutPath.appendSuffix("exe");
+
+  if (0 != sys::CopyFile(OutPath, llvmstub, &ErrMsg))
     PrintAndExit(ErrMsg);
 
   return;
@@ -532,6 +536,12 @@
 
     // Generate the bitcode for the optimized module.
     std::string RealBitcodeOutput = OutputFilename;
+
+#if defined(_WIN32) || defined(__CYGWIN__)
+    if (!LinkAsLibrary && sys::Path(OutputFilename).getSuffix() != "exe")
+      RealBitcodeOutput += ".exe";
+#endif
+
     if (!LinkAsLibrary) RealBitcodeOutput += ".bc";
     GenerateBitcode(Composite.get(), RealBitcodeOutput);