diff --git a/src/split/split.rs b/src/split/split.rs
index 9c6676d13..089b60440 100644
--- a/src/split/split.rs
+++ b/src/split/split.rs
@@ -1,5 +1,4 @@
 #![crate_name = "split"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -26,31 +25,33 @@ static NAME: &'static str = "split";
 static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optopt("a", "suffix-length", "use suffixes of length N (default 2)", "N"),
-        getopts::optopt("b", "bytes", "put SIZE bytes per output file", "SIZE"),
-        getopts::optopt("C", "line-bytes", "put at most SIZE bytes of lines per output file", "SIZE"),
-        getopts::optflag("d", "numeric-suffixes", "use numeric suffixes instead of alphabetic"),
-        getopts::optopt("l", "lines", "put NUMBER lines per output file", "NUMBER"),
-        getopts::optflag("", "verbose", "print a diagnostic just before each output file is opened"),
-        getopts::optflag("h", "help", "display help and exit"),
-        getopts::optflag("V", "version", "output version information and exit"),
-    ];
+    let mut opts = getopts::Options::new();
 
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    opts.optopt("a", "suffix-length", "use suffixes of length N (default 2)", "N");
+    opts.optopt("b", "bytes", "put SIZE bytes per output file", "SIZE");
+    opts.optopt("C", "line-bytes", "put at most SIZE bytes of lines per output file", "SIZE");
+    opts.optflag("d", "numeric-suffixes", "use numeric suffixes instead of alphabetic");
+    opts.optopt("l", "lines", "put NUMBER lines per output file", "NUMBER");
+    opts.optflag("", "verbose", "print a diagnostic just before each output file is opened");
+    opts.optflag("h", "help", "display help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "{}", f)
     };
 
     if matches.opt_present("h") {
-        println!("{} v{}", NAME, VERSION);
-        println!("");
-        println!("Usage:");
-        println!("  {0} [OPTION]... [INPUT [PREFIX]]", NAME);
-        println!("");
-        print!("{}", getopts::usage("Output fixed-size pieces of INPUT to PREFIXaa, PREFIX ab, ...; default size is 1000, and default PREFIX is 'x'. With no INPUT, or when INPUT is -, read standard input." , &opts));
-        println!("");
-        println!("SIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.");
+        let msg = format!("{0} v{1}
+
+Usage:
+  {0} [OPTION]... [INPUT [PREFIX]]
+
+Output fixed-size pieces of INPUT to PREFIXaa, PREFIX ab, ...; default
+size is 1000, and default PREFIX is 'x'. With no INPUT, or when INPUT is
+-, read standard input.", NAME, VERSION);
+
+        println!("{}\nSIZE may have a multiplier suffix: b for 512, k for 1K, m for 1 Meg.", opts.usage(&msg));
         return 0;
     }
 
diff --git a/src/sum/sum.rs b/src/sum/sum.rs
index db49c605e..cf8a5efa1 100644
--- a/src/sum/sum.rs
+++ b/src/sum/sum.rs
@@ -1,5 +1,4 @@
 #![crate_name = "sum"]
-#![feature(rustc_private)]
 
 /*
 * This file is part of the uutils coreutils package.
@@ -21,8 +20,8 @@ use std::path::Path;
 #[macro_use]
 mod util;
 
-static VERSION: &'static str = "1.0.0";
 static NAME: &'static str = "sum";
+static VERSION: &'static str = "1.0.0";
 
 fn bsd_sum(mut reader: Box<Read>) -> (usize, u16) {
     let mut buf = [0; 1024];
@@ -78,32 +77,30 @@ fn open(name: &str) -> Result<Box<Read>> {
 }
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let program = &args[0];
-    let opts = [
-        getopts::optflag("r", "", "use the BSD compatible algorithm (default)"),
-        getopts::optflag("s", "sysv", "use System V compatible algorithm"),
-        getopts::optflag("h", "help", "show this help message"),
-        getopts::optflag("v", "version", "print the version and exit"),
-    ];
+    let mut opts = getopts::Options::new();
 
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    opts.optflag("r", "", "use the BSD compatible algorithm (default)");
+    opts.optflag("s", "sysv", "use System V compatible algorithm");
+    opts.optflag("h", "help", "show this help message");
+    opts.optflag("v", "version", "print the version and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "Invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {
-        println!("{} {}", program, VERSION);
-        println!("");
-        println!("Usage:");
-        println!("  {0} [OPTION]... [FILE]...", program);
-        println!("");
-        print!("{}", getopts::usage("checksum and count the blocks in a file", &opts));
-        println!("");
-        println!("With no FILE, or when  FILE is -, read standard input.");
+        let msg = format!("{0} {1}
+
+Usage:
+  {0} [OPTION]... [FILE]...
+
+Checksum and count the blocks in a file.", NAME, VERSION);
+        println!("{}\nWith no FILE, or when  FILE is -, read standard input.", opts.usage(&msg));
         return 0;
     }
     if matches.opt_present("version") {
-        println!("{} {}", program, VERSION);
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
 
diff --git a/src/sync/sync.rs b/src/sync/sync.rs
index 0c4ca4280..ed5fb22eb 100644
--- a/src/sync/sync.rs
+++ b/src/sync/sync.rs
@@ -1,5 +1,4 @@
 #![crate_name = "sync"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,8 +14,6 @@
 extern crate getopts;
 extern crate libc;
 
-use getopts::{optflag, getopts, usage};
-
 #[path = "../common/util.rs"] #[macro_use] mod util;
 
 static NAME: &'static str = "sync";
@@ -141,20 +138,18 @@ mod platform {
 }
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let program = &args[0][..];
+    let mut opts = getopts::Options::new();
 
-    let options = [
-        optflag("h", "help", "display this help and exit"),
-        optflag("V", "version", "output version information and exit")
-    ];
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
 
-    let matches = match getopts(&args[1..], &options) {
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => { m }
-        _ => { help(program, &options); return 1 }
+        _ => { help(&opts); return 1 }
     };
 
     if matches.opt_present("h") {
-        help(program, &options);
+        help(&opts);
         return 0
     }
 
@@ -174,9 +169,15 @@ fn version() {
     println!("Author -- Alexander Fomin.");
 }
 
-fn help(program: &str, options: &[getopts::OptGroup]) {
-    println!("Usage: {} [OPTION]", program);
-    print!("{}", usage("Force changed blocks to disk, update the super block.", options));
+fn help(opts: &getopts::Options) {
+    let msg = format!("{0} {1}
+
+Usage:
+  {0} [OPTION]
+
+Force changed blocks to disk, update the super block.", NAME, VERSION);
+
+    print!("{}", opts.usage(&msg));
 }
 
 fn sync() -> isize {
diff --git a/src/tac/tac.rs b/src/tac/tac.rs
index 3ad69a7a2..995d5c2d7 100644
--- a/src/tac/tac.rs
+++ b/src/tac/tac.rs
@@ -1,5 +1,4 @@
 #![crate_name = "tac"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -14,7 +13,7 @@ extern crate getopts;
 extern crate libc;
 
 use std::fs::File;
-use std::io::{stdin, stdout, BufReader, Read, Stdout, Write};
+use std::io::{BufReader, Read, stdin, stdout, Stdout, Write};
 
 #[path = "../common/util.rs"]
 #[macro_use]
@@ -24,26 +23,29 @@ static NAME: &'static str = "tac";
 static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("b", "before", "attach the separator before instead of after"),
-        getopts::optflag("r", "regex", "interpret the sequence as a regular expression (NOT IMPLEMENTED)"),
-        getopts::optopt("s", "separator", "use STRING as the separator instead of newline", "STRING"),
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit")
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = getopts::Options::new();
+
+    opts.optflag("b", "before", "attach the separator before instead of after");
+    opts.optflag("r", "regex", "interpret the sequence as a regular expression (NOT IMPLEMENTED)");
+    opts.optopt("s", "separator", "use STRING as the separator instead of newline", "STRING");
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "{}", f)
     };
     if matches.opt_present("help") {
-        println!("tac {}", VERSION);
-        println!("");
-        println!("Usage:");
-        println!("  {0} [OPTION]... [FILE]...", &args[0][..]);
-        println!("");
-        print!("{}", getopts::usage("Write each file to standard output, last line first.", &opts));
+        let msg = format!("{0} {1}
+
+Usage:
+  {0} [OPTION]... [FILE]...
+
+Write each file to standard output, last line first.", NAME, VERSION);
+
+        print!("{}", opts.usage(&msg));
     } else if matches.opt_present("version") {
-        println!("tac {}", VERSION);
+        println!("{} {}", NAME, VERSION);
     } else {
         let before = matches.opt_present("b");
         let regex = matches.opt_present("r");
diff --git a/src/tee/tee.rs b/src/tee/tee.rs
index 5b8bb2e7c..52279708f 100644
--- a/src/tee/tee.rs
+++ b/src/tee/tee.rs
@@ -1,5 +1,4 @@
 #![crate_name = "tee"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -11,12 +10,14 @@
  */
 
 extern crate getopts;
-#[macro_use] extern crate log;
 
 use std::fs::OpenOptions;
 use std::io::{copy, Error, ErrorKind, Read, Result, sink, stdin, stdout, Write};
 use std::path::{Path, PathBuf};
-use getopts::{getopts, optflag, usage};
+
+#[path = "../common/util.rs"]
+#[macro_use]
+mod util;
 
 static NAME: &'static str = "tee";
 static VERSION: &'static str = "1.0.0";
@@ -38,21 +39,20 @@ struct Options {
 }
 
 fn options(args: &Vec<String>) -> Result<Options> {
-    let opts = [
-        optflag("a", "append", "append to the given FILEs, do not overwrite"),
-        optflag("i", "ignore-interrupts", "ignore interrupt signals"),
-        optflag("h", "help", "display this help and exit"),
-        optflag("V", "version", "output version information and exit"),
-    ];
+    let mut opts = getopts::Options::new();
 
-    getopts(&args[1..], &opts).map_err(|e| Error::new(ErrorKind::Other, format!("{}", e))).and_then(|m| {
+    opts.optflag("a", "append", "append to the given FILEs, do not overwrite");
+    opts.optflag("i", "ignore-interrupts", "ignore interrupt signals");
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    opts.parse(&args[1..]).map_err(|e| Error::new(ErrorKind::Other, format!("{}", e))).and_then(|m| {
         let version = format!("{} {}", NAME, VERSION);
-        let program = &args[0][..];
         let arguments = "[OPTION]... [FILE]...";
         let brief = "Copy standard input to each FILE, and also to standard output.";
         let comment = "If a FILE is -, copy again to standard output.";
         let help = format!("{}\n\nUsage:\n  {} {}\n\n{}\n{}",
-                           version, program, arguments, usage(brief, &opts),
+                           version, NAME, arguments, opts.usage(brief),
                            comment);
         let mut names: Vec<String> = m.free.clone().into_iter().collect();
         names.push("-".to_string());
@@ -60,7 +60,7 @@ fn options(args: &Vec<String>) -> Result<Options> {
                        else if m.opt_present("version") { Some(version) }
                        else { None };
         Ok(Options {
-            program: program.to_string(),
+            program: NAME.to_string(),
             append: m.opt_present("append"),
             ignore_interrupts: m.opt_present("ignore-interrupts"),
             print_and_exit: to_print,
@@ -169,6 +169,6 @@ impl Read for NamedReader {
 }
 
 fn warn(message: &str) -> Error {
-    error!("tee: {}", message);
-    Error::new(ErrorKind::Other, format!("tee: {}", message))
+    eprintln!("{}: {}", NAME, message);
+    Error::new(ErrorKind::Other, format!("{}: {}", NAME, message))
 }
diff --git a/src/truncate/truncate.rs b/src/truncate/truncate.rs
index c8332b9c7..7cffc301b 100644
--- a/src/truncate/truncate.rs
+++ b/src/truncate/truncate.rs
@@ -1,5 +1,4 @@
 #![crate_name = "truncate"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -34,32 +33,30 @@ enum TruncateMode {
 }
 
 static NAME: &'static str = "truncate";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let program = args[0].clone();
+    let mut opts = getopts::Options::new();
 
-    let opts = [
-        getopts::optflag("c", "no-create", "do not create files that do not exist"),
-        getopts::optflag("o", "io-blocks", "treat SIZE as the number of I/O blocks of the file rather than bytes (NOT IMPLEMENTED)"),
-        getopts::optopt("r", "reference", "base the size of each file on the size of RFILE", "RFILE"),
-        getopts::optopt("s", "size", "set or adjust the size of each file according to SIZE, which is in bytes unless --io-blocks is specified", "SIZE"),
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit")
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    opts.optflag("c", "no-create", "do not create files that do not exist");
+    opts.optflag("o", "io-blocks", "treat SIZE as the number of I/O blocks of the file rather than bytes (NOT IMPLEMENTED)");
+    opts.optopt("r", "reference", "base the size of each file on the size of RFILE", "RFILE");
+    opts.optopt("s", "size", "set or adjust the size of each file according to SIZE, which is in bytes unless --io-blocks is specified", "SIZE");
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
-        Err(f) => {
-            crash!(1, "{}", f)
-        }
+        Err(f) => { crash!(1, "{}", f) }
     };
 
     if matches.opt_present("help") {
-        println!("truncate 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {0} [OPTION]... FILE...", program);
+        println!("  {} [OPTION]... FILE...", NAME);
         println!("");
-        print!("{}", getopts::usage("Shrink or extend the size of each file to the specified size.", &opts));
+        print!("{}", opts.usage("Shrink or extend the size of each file to the specified size."));
         print!("
 SIZE is an integer with an optional prefix and optional unit.
 The available units (K, M, G, T, P, E, Z, and Y) use the following format:
@@ -79,7 +76,7 @@ file based on its current size:
     '%'  => round up to multiple of
 ");
     } else if matches.opt_present("version") {
-        println!("truncate 1.0.0");
+        println!("{} {}", NAME, VERSION);
     } else if matches.free.is_empty() {
         show_error!("missing an argument");
         return 1;
@@ -101,7 +98,6 @@ file based on its current size:
     0
 }
 
-
 fn truncate(no_create: bool, _: bool, reference: Option<String>, size: Option<String>, filenames: Vec<String>) -> Result<()> {
     let (refsize, mode) = match reference {
         Some(rfilename) => {
diff --git a/src/tty/tty.rs b/src/tty/tty.rs
index 52902160b..7bac51a0f 100644
--- a/src/tty/tty.rs
+++ b/src/tty/tty.rs
@@ -1,5 +1,4 @@
 #![crate_name = "tty"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,7 +14,6 @@
 extern crate getopts;
 extern crate libc;
 
-use getopts::{getopts, optflag};
 use std::ffi::CStr;
 use std::io::Write;
 
@@ -32,23 +30,24 @@ static NAME: &'static str = "tty";
 static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let options = [
-        optflag("s", "silent", "print nothing, only return an exit status"),
-        optflag("h", "help", "display this help and exit"),
-        optflag("V", "version", "output version information and exit")
-    ];
+    let mut opts = getopts::Options::new();
 
-    let matches = match getopts(&args[1..], &options) {
+    opts.optflag("s", "silent", "print nothing, only return an exit status");
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
-        Err(f) => {
-            crash!(2, "{}", f)
-        }
+        Err(f) => { crash!(2, "{}", f) }
     };
 
     if matches.opt_present("help") {
-        let usage = getopts::usage("Print the file name of the terminal connected to standard input.", &options);
-
-        println!("Usage: {} [OPTION]...\n{}", NAME, usage);
+        println!("{} {}", NAME, VERSION);
+        println!("");
+        println!("Usage:");
+        println!("  {} [OPTION]...", NAME);
+        println!("");
+        print!("{}", opts.usage("Print the file name of the terminal connected to standard input."));
     } else if matches.opt_present("version") {
         println!("{} {}", NAME, VERSION);
     } else {
diff --git a/src/uname/uname.rs b/src/uname/uname.rs
index 18cc80f67..7b5700f85 100644
--- a/src/uname/uname.rs
+++ b/src/uname/uname.rs
@@ -1,5 +1,4 @@
 #![crate_name = "uname"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,10 +14,10 @@
 extern crate getopts;
 extern crate libc;
 
+use c_types::utsname;
 use std::ffi::CStr;
 use std::io::Write;
 use std::mem::uninitialized;
-use c_types::utsname;
 
 #[path = "../common/util.rs"] #[macro_use] mod util;
 #[path = "../common/c_types.rs"] mod c_types;
@@ -51,31 +50,32 @@ unsafe fn getuname() -> Uts {
     }
 }
 
-
 static NAME: &'static str = "uname";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("a", "all", "Behave as though all of the options -mnrsv were specified."),
-        getopts::optflag("m", "machine", "print the machine hardware name."),
-        getopts::optflag("n", "nodename", "print the nodename (the nodename may be a name that the system is known by to a communications network)."),
-        getopts::optflag("p", "processor", "print the machine processor architecture name."),
-        getopts::optflag("r", "release", "print the operating system release."),
-        getopts::optflag("s", "sysname", "print the operating system name."),
-        getopts::optflag("v", "version", "print the operating system version."),
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = getopts::Options::new();
+
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("a", "all", "Behave as though all of the options -mnrsv were specified.");
+    opts.optflag("m", "machine", "print the machine hardware name.");
+    opts.optflag("n", "nodename", "print the nodename (the nodename may be a name that the system is known by to a communications network).");
+    opts.optflag("p", "processor", "print the machine processor architecture name.");
+    opts.optflag("r", "release", "print the operating system release.");
+    opts.optflag("s", "sysname", "print the operating system name.");
+    opts.optflag("v", "version", "print the operating system version.");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "{}", f),
     };
     if matches.opt_present("help") {
-        println!("uname 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {}", args[0]);
+        println!("  {} [OPTIONS]", NAME);
         println!("");
-        println!("{}", getopts::usage("The uname utility writes symbols representing one or more system characteristics to the standard output.", &opts));
+        print!("{}", opts.usage("The uname utility writes symbols representing one or more system characteristics to the standard output."));
         return 0;
     }
     let uname = unsafe { getuname() };
diff --git a/src/uniq/uniq.rs b/src/uniq/uniq.rs
index 376915d85..25f80bbd0 100644
--- a/src/uniq/uniq.rs
+++ b/src/uniq/uniq.rs
@@ -1,5 +1,4 @@
 #![crate_name = "uniq"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -13,11 +12,12 @@
 
 extern crate getopts;
 
+use getopts::{Matches, Options};
 use std::cmp::min;
-use std::str::FromStr;
 use std::fs::File;
-use std::io::{stdin, stdout, BufRead, BufReader, BufWriter, Read, Write};
+use std::io::{BufRead, BufReader, BufWriter, Read, stdin, stdout, Write};
 use std::path::Path;
+use std::str::FromStr;
 
 #[path = "../common/util.rs"]
 #[macro_use]
@@ -113,7 +113,7 @@ impl Uniq {
     }
 }
 
-fn opt_parsed<T: FromStr>(opt_name: &str, matches: &getopts::Matches) -> Option<T> {
+fn opt_parsed<T: FromStr>(opt_name: &str, matches: &Matches) -> Option<T> {
     matches.opt_str(opt_name).map(|arg_str| {
         let opt_val: Option<T> = arg_str.parse().ok();
         opt_val.unwrap_or_else(||
@@ -122,23 +122,24 @@ fn opt_parsed<T: FromStr>(opt_name: &str, matches: &getopts::Matches) -> Option<
 }
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("c", "count", "prefix lines by the number of occurrences"),
-        getopts::optflag("d", "repeated", "only print duplicate lines"),
-        getopts::optflagopt(
-            "D",
-            "all-repeated",
-            "print all duplicate lines delimit-method={none(default),prepend,separate} Delimiting is done with blank lines",
-            "delimit-method"
-        ),
-        getopts::optopt("s", "skip-chars", "avoid comparing the first N characters", "N"),
-        getopts::optopt("w", "check-chars", "compare no more than N characters in lines", "N"),
-        getopts::optflag("i", "ignore-case", "ignore differences in case when comparing"),
-        getopts::optflag("u", "unique", "only print unique lines"),
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit")
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = Options::new();
+
+    opts.optflag("c", "count", "prefix lines by the number of occurrences");
+    opts.optflag("d", "repeated", "only print duplicate lines");
+    opts.optflagopt(
+        "D",
+        "all-repeated",
+        "print all duplicate lines delimit-method={none(default),prepend,separate} Delimiting is done with blank lines",
+        "delimit-method"
+    );
+    opts.optopt("s", "skip-chars", "avoid comparing the first N characters", "N");
+    opts.optopt("w", "check-chars", "compare no more than N characters in lines", "N");
+    opts.optflag("i", "ignore-case", "ignore differences in case when comparing");
+    opts.optflag("u", "unique", "only print unique lines");
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "{}", f)
     };
@@ -147,13 +148,13 @@ pub fn uumain(args: Vec<String>) -> i32 {
         println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {0} [OPTION]... [FILE]...", args[0]);
+        println!("  {0} [OPTION]... [FILE]...", NAME);
         println!("");
-        print!("{}", getopts::usage("Filter adjacent matching lines from INPUT (or standard input),\n\
-                                    writing to OUTPUT (or standard output).", &opts));
+        print!("{}", opts.usage("Filter adjacent matching lines from INPUT (or standard input),\n\
+                                    writing to OUTPUT (or standard output)."));
         println!("");
         println!("Note: '{0}' does not detect repeated lines unless they are adjacent.\n\
-                  You may want to sort the input first, or use 'sort -u' without '{0}'.\n", args[0]);
+                  You may want to sort the input first, or use 'sort -u' without '{0}'.\n", NAME);
     } else if matches.opt_present("version") {
         println!("{} {}", NAME, VERSION);
     } else {
diff --git a/src/unlink/unlink.rs b/src/unlink/unlink.rs
index 3aeb8b473..1c9a5e02d 100644
--- a/src/unlink/unlink.rs
+++ b/src/unlink/unlink.rs
@@ -1,5 +1,4 @@
 #![crate_name = "unlink"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,53 +14,52 @@
 extern crate getopts;
 extern crate libc;
 
+use getopts::Options;
 use libc::consts::os::posix88::{S_IFMT, S_IFLNK, S_IFREG};
-use libc::types::os::arch::c95::c_char;
-use libc::types::os::arch::posix01::stat;
 use libc::funcs::posix01::stat_::lstat;
 use libc::funcs::posix88::unistd::unlink;
-
-use std::mem::uninitialized;
+use libc::types::os::arch::c95::c_char;
+use libc::types::os::arch::posix01::stat;
 use std::io::{Error, ErrorKind, Write};
+use std::mem::uninitialized;
 
 #[path = "../common/util.rs"]
 #[macro_use]
 mod util;
 
 static NAME: &'static str = "unlink";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit"),
-    ];
+    let mut opts = Options::new();
 
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
-        Err(f) => {
-            crash!(1, "invalid options\n{}", f)
-        }
+        Err(f) => crash!(1, "invalid options\n{}", f)
     };
 
     if matches.opt_present("help") {
-        println!("unlink 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {0} [FILE]... [OPTION]...", args[0]);
+        println!("  {} [FILE]... [OPTION]...", NAME);
         println!("");
-        println!("{}", getopts::usage("Unlink the file at [FILE].", &opts));
+        println!("{}", opts.usage("Unlink the file at [FILE]."));
         return 0;
     }
 
     if matches.opt_present("version") {
-        println!("unlink 1.0.0");
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
 
     if matches.free.len() == 0 {
-        crash!(1, "missing operand\nTry '{0} --help' for more information.", args[0]);
+        crash!(1, "missing operand\nTry '{0} --help' for more information.", NAME);
     } else if matches.free.len() > 1 {
-        crash!(1, "extra operand: '{1}'\nTry '{0} --help' for more information.", args[0], matches.free[1]);
+        crash!(1, "extra operand: '{1}'\nTry '{0} --help' for more information.", NAME, matches.free[1]);
     }
 
     let st_mode = {
diff --git a/src/uptime/uptime.rs b/src/uptime/uptime.rs
index 580576c2f..7b3730ef5 100644
--- a/src/uptime/uptime.rs
+++ b/src/uptime/uptime.rs
@@ -1,5 +1,4 @@
 #![crate_name = "uptime"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -16,12 +15,13 @@ extern crate getopts;
 extern crate libc;
 extern crate time as rtime;
 
+use getopts::Options;
+use libc::{time_t, c_double, c_int, c_char};
 use std::ffi::CString;
 use std::fs::File;
 use std::io::{Read, Write};
 use std::mem::transmute;
 use std::ptr::null;
-use libc::{time_t, c_double, c_int, c_char};
 use utmpx::*;
 
 #[path = "../common/util.rs"] #[macro_use] mod util;
@@ -31,6 +31,7 @@ use utmpx::*;
 #[path = "../common/utmpx.rs"] mod utmpx;
 
 static NAME: &'static str = "uptime";
+static VERSION: &'static str = "1.0.0";
 
 #[cfg(unix)]
 extern {
@@ -55,26 +56,28 @@ unsafe extern fn utmpxname(_file: *const c_char) -> c_int {
 }
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let program = args[0].clone();
-    let opts = [
-        getopts::optflag("v", "version", "output version information and exit"),
-        getopts::optflag("h", "help", "display this help and exit"),
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = Options::new();
+
+    opts.optflag("v", "version", "output version information and exit");
+    opts.optflag("h", "help", "display this help and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "Invalid options\n{}", f)
     };
     if matches.opt_present("version") {
-        println!("uptime 1.0.0");
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
     if matches.opt_present("help") || matches.free.len() > 0 {
-        println!("Usage:");
-        println!("  {0} [OPTION]", program);
+        println!("{} {}", NAME, VERSION);
         println!("");
-        println!("{}", getopts::usage("Print the current time, the length of time the system has been up,\n\
+        println!("Usage:");
+        println!("  {0} [OPTION]", NAME);
+        println!("");
+        println!("{}", opts.usage("Print the current time, the length of time the system has been up,\n\
                               the number of users on the system, and the average number of jobs\n\
-                              in the run queue over the last 1, 5 and 15 minutes.", &opts));
+                              in the run queue over the last 1, 5 and 15 minutes."));
         return 0;
     }
 
diff --git a/src/users/users.rs b/src/users/users.rs
index 8a13dcf2b..17aafcf67 100644
--- a/src/users/users.rs
+++ b/src/users/users.rs
@@ -1,5 +1,4 @@
 #![crate_name = "users"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -18,6 +17,7 @@
 extern crate getopts;
 extern crate libc;
 
+use getopts::Options;
 use std::ffi::{CStr, CString};
 use std::mem;
 use std::ptr;
@@ -50,30 +50,31 @@ unsafe extern fn utmpxname(_file: *const libc::c_char) -> libc::c_int {
 }
 
 static NAME: &'static str = "users";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit"),
-    ];
+    let mut opts = Options::new();
 
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => panic!("{}", f),
     };
 
     if matches.opt_present("help") {
-        println!("users 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {} [OPTION]... [FILE]", args[0]);
+        println!("  {} [OPTION]... [FILE]", NAME);
         println!("");
-        println!("{}", getopts::usage("Output who is currently logged in according to FILE.", &opts));
+        println!("{}", opts.usage("Output who is currently logged in according to FILE."));
         return 0;
     }
 
     if matches.opt_present("version") {
-        println!("users 1.0.0");
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
 
diff --git a/src/whoami/whoami.rs b/src/whoami/whoami.rs
index b1e6d76a8..5216688bf 100644
--- a/src/whoami/whoami.rs
+++ b/src/whoami/whoami.rs
@@ -1,5 +1,4 @@
 #![crate_name = "whoami"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,33 +14,36 @@
 extern crate getopts;
 extern crate libc;
 
+use getopts::Options;
 use std::io::Write;
 
 #[path = "../common/util.rs"] #[macro_use] mod util;
 mod platform;
 
 static NAME: &'static str = "whoami";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let opts = [
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit"),
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = Options::new();
+
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
         Err(f) => crash!(1, "{}", f),
     };
     if matches.opt_present("help") {
-        println!("whoami 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {}", args[0]);
+        println!("  {} [OPTIONS]", NAME);
         println!("");
-        println!("{}", getopts::usage("print effective userid", &opts));
+        println!("{}", opts.usage("print effective userid"));
         return 0;
     }
     if matches.opt_present("version") {
-        println!("whoami 1.0.0");
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
 
diff --git a/src/yes/yes.rs b/src/yes/yes.rs
index 72c637330..870d61128 100644
--- a/src/yes/yes.rs
+++ b/src/yes/yes.rs
@@ -1,5 +1,4 @@
 #![crate_name = "yes"]
-#![feature(rustc_private)]
 
 /*
  * This file is part of the uutils coreutils package.
@@ -15,6 +14,7 @@
 extern crate getopts;
 extern crate libc;
 
+use getopts::Options;
 use std::io::Write;
 
 #[path = "../common/util.rs"]
@@ -22,30 +22,29 @@ use std::io::Write;
 mod util;
 
 static NAME: &'static str = "yes";
+static VERSION: &'static str = "1.0.0";
 
 pub fn uumain(args: Vec<String>) -> i32 {
-    let program = &args[0];
-    let opts = [
-        getopts::optflag("h", "help", "display this help and exit"),
-        getopts::optflag("V", "version", "output version information and exit"),
-    ];
-    let matches = match getopts::getopts(&args[1..], &opts) {
+    let mut opts = Options::new();
+
+    opts.optflag("h", "help", "display this help and exit");
+    opts.optflag("V", "version", "output version information and exit");
+
+    let matches = match opts.parse(&args[1..]) {
         Ok(m) => m,
-        Err(f) => {
-            crash!(1, "invalid options\n{}", f)
-        }
+        Err(f) => crash!(1, "invalid options\n{}", f)
     };
     if matches.opt_present("help") {
-        println!("yes 1.0.0");
+        println!("{} {}", NAME, VERSION);
         println!("");
         println!("Usage:");
-        println!("  {0} [STRING]... [OPTION]...", program);
+        println!("  {0} [STRING]... [OPTION]...", NAME);
         println!("");
-        print!("{}", getopts::usage("Repeatedly output a line with all specified STRING(s), or 'y'.", &opts));
+        print!("{}", opts.usage("Repeatedly output a line with all specified STRING(s), or 'y'."));
         return 0;
     }
     if matches.opt_present("version") {
-        println!("yes 1.0.0");
+        println!("{} {}", NAME, VERSION);
         return 0;
     }
     let string = if matches.free.is_empty() {