diff --git a/man/rustc.1 b/man/rustc.1
index 8fc6828ced18b..308b2f089f4a0 100644
--- a/man/rustc.1
+++ b/man/rustc.1
@@ -27,9 +27,6 @@ Display this message
 \fB\-L\fR PATH
 Add a directory to the library search path
 .TP
-\fB\-\-ls\fR
-List the symbols defined by a library crate
-.TP
 \fB\-\-no\-trans\fR
 Run all passes except translation; no output
 .TP
diff --git a/src/librustc/driver/driver.rs b/src/librustc/driver/driver.rs
index 1b3653c6948a6..908ef5ca63698 100644
--- a/src/librustc/driver/driver.rs
+++ b/src/librustc/driver/driver.rs
@@ -1096,7 +1096,6 @@ pub fn optgroups() -> Vec<getopts::OptGroup> {
   optflag("", "crate-name", "Output the crate name and exit"),
   optflag("", "crate-file-name", "Output the file(s) that would be written if compilation \
           continued and exit"),
-  optflag("",  "ls",  "List the symbols defined by a library crate"),
   optflag("g",  "",  "Equivalent to --debuginfo=2"),
   optopt("",  "debuginfo",  "Emit DWARF debug info to the objects created:
          0 = no debug info,
diff --git a/src/librustc/driver/session.rs b/src/librustc/driver/session.rs
index a412742ab3a36..16b05612e252a 100644
--- a/src/librustc/driver/session.rs
+++ b/src/librustc/driver/session.rs
@@ -69,7 +69,8 @@ debugging_opts!(
         PRINT_LLVM_PASSES,
         LTO,
         AST_JSON,
-        AST_JSON_NOEXPAND
+        AST_JSON_NOEXPAND,
+        LS
     ]
     0
 )
@@ -102,7 +103,8 @@ pub fn debugging_opts_map() -> Vec<(&'static str, &'static str, u64)> {
       PRINT_LLVM_PASSES),
      ("lto", "Perform LLVM link-time optimizations", LTO),
      ("ast-json", "Print the AST as JSON and halt", AST_JSON),
-     ("ast-json-noexpand", "Print the pre-expansion AST as JSON and halt", AST_JSON_NOEXPAND))
+     ("ast-json-noexpand", "Print the pre-expansion AST as JSON and halt", AST_JSON_NOEXPAND),
+     ("ls", "List the symbols defined by a library crate", LS))
 }
 
 #[deriving(Clone, Eq)]
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index b9acd41321520..411d9019632ce 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -299,8 +299,8 @@ pub fn run_compiler(args: &[~str]) {
         }
         None::<d::PpMode> => {/* continue */ }
     }
-    let ls = matches.opt_present("ls");
-    if ls {
+
+    if r.contains(&~"ls") {
         match input {
             d::FileInput(ref ifile) => {
                 let mut stdout = io::stdout();
diff --git a/src/test/run-make/ls-metadata/Makefile b/src/test/run-make/ls-metadata/Makefile
index b568809156bfb..fc3f5bce0cda2 100644
--- a/src/test/run-make/ls-metadata/Makefile
+++ b/src/test/run-make/ls-metadata/Makefile
@@ -2,6 +2,6 @@
 
 all:
 	$(RUSTC) foo.rs
-	$(RUSTC) --ls $(TMPDIR)/foo
+	$(RUSTC) -Z ls $(TMPDIR)/foo
 	touch $(TMPDIR)/bar
-	$(RUSTC) --ls $(TMPDIR)/bar
+	$(RUSTC) -Z ls $(TMPDIR)/bar