diff --git a/Makefile b/Makefile
index c073cc9..ddf5911 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,10 @@ KCARGOFLAGS=--target $(KTARGET).json --release -- -C soft-float
 TARGET=$(ARCH)-unknown-redox
 BUILD=build/userspace
 RUSTC=./rustc.sh
-RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0 --cfg redox
+RUSTCFLAGS=--target $(TARGET).json -C opt-level=2 -C debuginfo=0
 RUSTDOC=./rustdoc.sh
 CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo
-CARGOFLAGS=--target $(TARGET).json --release -- --cfg redox
+CARGOFLAGS=--target $(TARGET).json --release --
 
 # Default targets
 .PHONY: all clean doc ref update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE
diff --git a/libstd b/libstd
index c98bf6a..166a1f0 160000
--- a/libstd
+++ b/libstd
@@ -1 +1 @@
-Subproject commit c98bf6a5038229eb7eda07068f6d5d6c0b061253
+Subproject commit 166a1f0a468205c7166791563d00e663559a8e93
diff --git a/rust b/rust
index 79a8c27..25e1a4a 160000
--- a/rust
+++ b/rust
@@ -1 +1 @@
-Subproject commit 79a8c272fb8ad09600ef58ff223c73eb44343040
+Subproject commit 25e1a4a0084a56807d7a1e4ca676e078c085b3aa