diff --git a/src/comp/driver/driver.rs b/src/comp/driver/driver.rs
index 5a771abc24f..cae0cda7e70 100644
--- a/src/comp/driver/driver.rs
+++ b/src/comp/driver/driver.rs
@@ -564,11 +564,13 @@ fn build_output_filenames(ifile: str,
           }
         };
 
-        let (base_path, _) = if !input_is_stdin(ifile) {
-            fs::splitext(ifile)
+        let base_filename = if !input_is_stdin(ifile) {
+            let (path, _) = fs::splitext(ifile);
+            fs::basename(path)
         } else {
-            (fs::connect(dirname, "rust_out"), "")
+            "rust_out"
         };
+        let base_path = fs::connect(dirname, base_filename);
 
 
         if sess.building_library {