diff --git a/.gitmodules b/.gitmodules
index 3335d1ad475a640824d282d91a0e697db05539a7..57d375891a667fbda750ccaf3d9eae592e32bccc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -49,9 +49,9 @@
 [submodule "crates/docgen"]
 	path = crates/docgen
 	url = https://github.com/redox-os/docgen.git
-[submodule "libstd_real/openlibm"]
+[submodule "libstd/openlibm"]
 	path = libstd/openlibm
-	url = https://github.com/redox-os/openlibm.git
+	url = https://github.com/JuliaLang/openlibm.git
 [submodule "programs/binutils"]
 	path = programs/binutils
 	url = https://github.com/redox-os/binutils.git
diff --git a/Cargo.toml b/Cargo.toml
index 95e2c730721fc6c3bb04e345dbc84e1af799268f..5c3c138c0fca2cc4db9833e059c8a068b1bd52bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,7 +13,7 @@ spin = "*"
 redox_syscall = { path = "syscall/" }
 
 [dependencies.goblin]
-git = "https://github.com/redox-os/goblin.git"
+git = "https://github.com/m4b/goblin.git"
 default-features = false
 features = ["elf32", "elf64"]
 
diff --git a/Makefile b/Makefile
index 8d1995c689c89497957058c8f9b3b4c904496d71..93e28257dc0de2bfa8d84ad43b26c675779c7ceb 100644
--- a/Makefile
+++ b/Makefile
@@ -358,7 +358,7 @@ $(BUILD)/libstd_unicode.rlib: rust/src/libstd_unicode/lib.rs $(BUILD)/libcore.rl
 	$(RUSTC) $(RUSTCFLAGS) -o $@ $<
 
 libstd/openlibm/libopenlibm.a:
-	CROSSCC=$(CC) CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a
+	CFLAGS=-fno-stack-protector make -C libstd/openlibm libopenlibm.a
 
 $(BUILD)/libopenlibm.a: libstd/openlibm/libopenlibm.a
 	mkdir -p $(BUILD)