diff --git a/man/rustc.1 b/man/rustc.1
index 68c3e01cb21..58109cd1e9e 100644
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -25,7 +25,8 @@ output filename for \fBfoo.rs\fR is otherwise \fBfoo\fR plus any
 platform-specific extension (when compiling a binary), a
 platform-specific name, e.g. \fBlibfoo.so\fR (when compiling a
 library), \fBfoo.o\fR (when using \fB-c\fR), \fBfoo.s\fR (when using
-\fB-S\fR) or \fBfoo.bc\fR (when using \fB--emit-llvm\fR), and
+\fB-S\fR) or \fBfoo.bc\fR (when using \fB--emit-llvm\fR), and \fBfoo.ll\fR
+(when using both \fB-S\fR and \fB--emit-llvm\fR).
 .TP
 \fB--lib\fR:
 Compile and link a library crate into a shared object.
@@ -82,7 +83,9 @@ Compile to assembly, but do not assemble or link.
 Compile and assemble, but do not link.
 .TP
 \fB--emit-llvm\fR:
-Generate llvm bitcode.
+Generate output files in LLVM format. When used with \fB-S\fR this generate LLVM
+intermediate language assembly files, otherwise this generates LLVM bitcode
+format object files. 
 .TP
 \fB--save-temps\fR:
 For foo.rs, save generated bitcode before optimization to
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index 3787baffc82..ec715593ce7 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -477,7 +477,7 @@ fn build_output_filenames(ifile: str, ofile: option::t<str>,
               link::output_type_none. { "none" }
               link::output_type_bitcode. { "bc" }
               link::output_type_assembly. { "s" }
-              link::output_type_llvm_assembly. { "s" }
+              link::output_type_llvm_assembly. { "ll" }
               // Object and exe output both use the '.o' extension here
               link::output_type_object. | link::output_type_exe. {
                 "o"