diff --git a/.gitmodules b/.gitmodules
index bed0a1ede..ba9d015d2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,7 +25,7 @@
 [submodule "rust"]
 	path = rust
 	url = https://gitlab.redox-os.org/redox-os/rust.git
-	branch = redox-2019-04-06
+	branch = redox-unix-2019-04-06
 [submodule "redoxfs"]
 	path = redoxfs
 	url = https://gitlab.redox-os.org/redox-os/redoxfs.git
diff --git a/config/desktop.toml b/config/desktop.toml
index c9f5546ee..a4864a21c 100644
--- a/config/desktop.toml
+++ b/config/desktop.toml
@@ -120,6 +120,7 @@ ptyd = {}
 redoxfs = {}
 #redox-ssh = {}
 #relibc = {}
+#relibc-tests = {}
 #ripgrep = {}
 #rodioplay = {}
 #rs-nes = {}
diff --git a/cookbook b/cookbook
index 1483b6cd5..e16d69117 160000
--- a/cookbook
+++ b/cookbook
@@ -1 +1 @@
-Subproject commit 1483b6cd5c724870b0c2a9d7fc6dd4eca6a6c3db
+Subproject commit e16d69117a8494110bb8a4286cb2273ed86bc712
diff --git a/mk/config.mk b/mk/config.mk
index e84845097..1733ca1de 100644
--- a/mk/config.mk
+++ b/mk/config.mk
@@ -4,7 +4,7 @@ ARCH?=x86_64
 ## Flags to pass to the installer (empty to download binary packages)
 INSTALLER_FLAGS?=--cookbook=cookbook
 ## Enabled to use binary prefix (much faster)
-PREFIX_BINARY?=1
+PREFIX_BINARY?=0
 ## Enabled to build custom rustc
 PREFIX_RUSTC?=1
 ## Filesystem size in MB (256 is the default)
diff --git a/relibc b/relibc
index dab6530fb..e92953809 160000
--- a/relibc
+++ b/relibc
@@ -1 +1 @@
-Subproject commit dab6530fb40200e8ee8ecebc315ecf8dd88d385b
+Subproject commit e929538098376804370e84c0a7b8c92d9ccc2a0c
diff --git a/rust b/rust
index 57cf5eabf..21ba98fa2 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit 57cf5eabfda7e4a3182559159f98b95bf9085826
+Subproject commit 21ba98fa2cebf10914e1ee1d8bea9e512d26c358
diff --git a/shell.nix b/shell.nix
index 5536dc485..1005d2eef 100644
--- a/shell.nix
+++ b/shell.nix
@@ -1,14 +1,6 @@
-let
-  pkgs = import <nixpkgs> {
-    overlays = [
-      (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz))
-    ];
-  };
-  rust = (pkgs.rustChannelOf {
-    date = "2019-04-06";
-    channel = "nightly";
-  }).rust;
-in pkgs.mkShell rec {
+{ pkgs ? import <nixpkgs> {} }:
+
+pkgs.mkShell rec {
   hardeningDisable = [ "all" ];
 
   # used in mk/prefix.mk to patch interpreter when PREFIX_BINARY=1
@@ -20,7 +12,7 @@ in pkgs.mkShell rec {
   ];
   LD_LIBRARY_PATH = LIBRARY_PATH;
 
-  nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rust ];
+  nativeBuildInputs = with pkgs; [ gnumake cmake nasm pkgconfig gcc automake autoconf bison gperf qemu rustup ];
   buildInputs = with pkgs; [ fuse openssl gettext libtool flex libpng perl perlPackages.HTMLParser ];
 
   shellHook = ''