diff --git a/Cargo.lock b/Cargo.lock
index b2e574e6c..75b81425b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -38,7 +38,7 @@ name = "arch"
 version = "0.0.1"
 dependencies = [
  "platform-info 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -81,21 +81,21 @@ name = "base32"
 version = "0.0.1"
 dependencies = [
  "clippy 0.0.212 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
 name = "base64"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
 name = "basename"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -163,7 +163,7 @@ version = "0.0.1"
 dependencies = [
  "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "unix_socket 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -180,7 +180,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "chgrp"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -189,7 +189,7 @@ name = "chmod"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "walker 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -199,7 +199,7 @@ version = "0.0.1"
 dependencies = [
  "clippy 0.0.212 (registry+https://github.com/rust-lang/crates.io-index)",
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -218,7 +218,7 @@ name = "chroot"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -226,7 +226,7 @@ name = "cksum"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -293,7 +293,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -307,7 +307,7 @@ dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "xattr 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -391,7 +391,7 @@ dependencies = [
 name = "cut"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -405,7 +405,7 @@ version = "0.0.1"
 dependencies = [
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -421,7 +421,7 @@ name = "dircolors"
 version = "0.0.1"
 dependencies = [
  "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -429,7 +429,7 @@ name = "dirname"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -437,7 +437,7 @@ name = "du"
 version = "0.0.1"
 dependencies = [
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -449,7 +449,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "echo"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -464,7 +464,7 @@ dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -481,7 +481,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -490,7 +490,7 @@ version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "onig 4.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -498,7 +498,7 @@ name = "factor"
 version = "0.0.1"
 dependencies = [
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -529,7 +529,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "false"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -548,7 +548,7 @@ version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -560,7 +560,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "fold"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -599,7 +599,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "groups"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -621,7 +621,7 @@ dependencies = [
  "sha1 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha3 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -629,7 +629,7 @@ name = "head"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -642,7 +642,7 @@ name = "hostid"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -651,7 +651,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -659,7 +659,7 @@ dependencies = [
 name = "id"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -684,7 +684,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -729,7 +729,7 @@ name = "join"
 version = "0.0.1"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -746,7 +746,7 @@ name = "kill"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -766,7 +766,7 @@ dependencies = [
  "cpp 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "cpp_build 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -774,7 +774,7 @@ name = "link"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -782,7 +782,7 @@ name = "ln"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -790,7 +790,7 @@ name = "logname"
 version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -805,7 +805,7 @@ dependencies = [
  "termsize 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -837,7 +837,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -846,7 +846,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -855,7 +855,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -865,7 +865,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -876,7 +876,7 @@ dependencies = [
  "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -884,7 +884,7 @@ name = "mv"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -893,7 +893,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -907,18 +907,6 @@ dependencies = [
  "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "nix"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "cfg-if 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "nl"
 version = "0.0.1"
@@ -929,7 +917,7 @@ dependencies = [
  "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -943,7 +931,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -953,7 +941,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -990,7 +978,7 @@ name = "numfmt"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1006,7 +994,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "half 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1034,7 +1022,7 @@ name = "paste"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1043,7 +1031,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1055,7 +1043,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 name = "pinky"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1077,7 +1065,7 @@ name = "printenv"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1085,7 +1073,7 @@ name = "printf"
 version = "0.0.1"
 dependencies = [
  "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1106,7 +1094,7 @@ dependencies = [
  "memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex-syntax 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1123,7 +1111,7 @@ name = "pwd"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1292,7 +1280,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1300,7 +1288,7 @@ name = "realpath"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1341,7 +1329,7 @@ name = "relpath"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1358,7 +1346,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1367,7 +1355,7 @@ name = "rmdir"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1428,7 +1416,7 @@ name = "seq"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1493,7 +1481,7 @@ dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1502,7 +1490,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1510,7 +1498,7 @@ name = "sleep"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1525,7 +1513,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1533,7 +1521,7 @@ name = "split"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1542,7 +1530,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1552,7 +1540,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libstdbuf 0.0.1",
  "tempdir 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1565,7 +1553,7 @@ name = "sum"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1595,7 +1583,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1621,7 +1609,7 @@ name = "tac"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1632,7 +1620,7 @@ dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1642,7 +1630,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1703,7 +1691,7 @@ version = "0.0.1"
 dependencies = [
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1739,7 +1727,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1757,7 +1745,7 @@ dependencies = [
  "filetime 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1767,14 +1755,14 @@ dependencies = [
  "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
 name = "true"
 version = "0.0.1"
 dependencies = [
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1782,7 +1770,7 @@ name = "truncate"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1790,7 +1778,7 @@ name = "tsort"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1799,7 +1787,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1818,7 +1806,7 @@ version = "0.0.1"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "platform-info 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1827,7 +1815,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1871,7 +1859,7 @@ name = "uniq"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1889,7 +1877,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1898,7 +1886,7 @@ version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1916,7 +1904,7 @@ name = "users"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -1927,7 +1915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "uucore"
 version = "0.0.2"
-source = "git+https://github.com/rivy/rust.uucore?tag=0.0.2#420b20f67267357f4f0f626a1e8a00a27304623d"
+source = "git+https://github.com/uutils/uucore/?tag=0.0.2#420b20f67267357f4f0f626a1e8a00a27304623d"
 dependencies = [
  "backtrace 0.3.30 (registry+https://github.com/rust-lang/crates.io-index)",
  "data-encoding 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1937,7 +1925,7 @@ dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "platform-info 0.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2048,7 +2036,7 @@ dependencies = [
  "unlink 0.0.1",
  "uptime 0.0.1",
  "users 0.0.1",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "wc 0.0.1",
  "who 0.0.1",
  "whoami 0.0.1",
@@ -2085,7 +2073,7 @@ name = "wc"
 version = "0.0.1"
 dependencies = [
  "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -2093,7 +2081,7 @@ name = "who"
 version = "0.0.1"
 dependencies = [
  "clippy 0.0.212 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [[package]]
@@ -2102,7 +2090,7 @@ version = "0.0.1"
 dependencies = [
  "advapi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
  "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2164,7 +2152,7 @@ name = "yes"
 version = "0.0.1"
 dependencies = [
  "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)",
+ "uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)",
 ]
 
 [metadata]
@@ -2230,7 +2218,6 @@ dependencies = [
 "checksum md5 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)" = "79c56d6a0b07f9e19282511c83fc5b086364cbae4ba8c7d5f190c3d9b0425a48"
 "checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
 "checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
-"checksum nix 0.13.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4dbdc256eaac2e3bd236d93ad999d3479ef775c863dbda3068c4006a92eec51b"
 "checksum nix 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "47e49f6982987135c5e9620ab317623e723bd06738fd85377e8d55f57c8b6487"
 "checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945"
 "checksum num-integer 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "e83d528d2677f0518c570baf2b7abdcf0cd2d248860b68507bdcb3e91d4c0cea"
@@ -2308,7 +2295,7 @@ dependencies = [
 "checksum unix_socket 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6aa2700417c405c38f5e6902d699345241c28c0b7ade4abaad71e35a87eb1564"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
-"checksum uucore 0.0.2 (git+https://github.com/rivy/rust.uucore?tag=0.0.2)" = "<none>"
+"checksum uucore 0.0.2 (git+https://github.com/uutils/uucore/?tag=0.0.2)" = "<none>"
 "checksum vec_map 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "05c78687fb1a80548ae3250346c3db86a80a7cdd77bda190189f2d0a0987c81a"
 "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 "checksum walkdir 2.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c7904a7e2bb3cdf0cf5e783f44204a85a37a93151738fa349f06680f59a98b45"
diff --git a/Cargo.toml b/Cargo.toml
index 1ed983353..5a6e7011b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -314,4 +314,4 @@ path = "src/bin/uutils.rs"
 name = "tests"
 
 [patch.crates-io]
-uucore = { git = "https://github.com/rivy/rust.uucore", tag = "0.0.2" }
+uucore = { git = "https://github.com/uutils/uucore/", tag = "0.0.2" }