diff --git a/Cargo.toml b/Cargo.toml
index f1e65e154a..49e6a5bd58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -13,8 +13,8 @@ members = [
     "src/crt0",
     "src/crti",
     "src/crtn",
-    "src/ld_so",
     "src/platform/redox/redox-exec",
+    "ld_so",
 ]
 exclude = ["tests", "dlmalloc-rs"]
 
diff --git a/Makefile b/Makefile
index be39111594..62d574a5f0 100644
--- a/Makefile
+++ b/Makefile
@@ -170,11 +170,11 @@ $(BUILD)/debug/crtn.o: $(SRC)
 	touch $@
 
 $(BUILD)/debug/ld_so.o: $(SRC)
-	$(CARGO) rustc --manifest-path src/ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	$(CARGO) rustc --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
 	touch $@
 
 $(BUILD)/debug/ld_so: $(BUILD)/debug/ld_so.o $(BUILD)/debug/crti.o $(BUILD)/debug/libc.a $(BUILD)/debug/crtn.o
-	$(LD) --no-relax -T src/ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
+	$(LD) --no-relax -T ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
 
 # Release targets
 
@@ -210,11 +210,11 @@ $(BUILD)/release/crtn.o: $(SRC)
 	touch $@
 
 $(BUILD)/release/ld_so.o: $(SRC)
-	$(CARGO) rustc --release --manifest-path src/ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
+	$(CARGO) rustc --release --manifest-path ld_so/Cargo.toml $(CARGOFLAGS) -- --emit obj=$@ -C panic=abort $(RUSTCFLAGS)
 	touch $@
 
 $(BUILD)/release/ld_so: $(BUILD)/release/ld_so.o $(BUILD)/release/crti.o $(BUILD)/release/libc.a $(BUILD)/release/crtn.o
-	$(LD) --no-relax -T src/ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
+	$(LD) --no-relax -T ld_so/ld_script/$(TARGET).ld --allow-multiple-definition --gc-sections --gc-keep-exported $^ -o $@
 
 # Other targets
 
diff --git a/src/ld_so/Cargo.toml b/ld_so/Cargo.toml
similarity index 100%
rename from src/ld_so/Cargo.toml
rename to ld_so/Cargo.toml
diff --git a/src/ld_so/ld_script/aarch64-unknown-redox.ld b/ld_so/ld_script/aarch64-unknown-redox.ld
similarity index 100%
rename from src/ld_so/ld_script/aarch64-unknown-redox.ld
rename to ld_so/ld_script/aarch64-unknown-redox.ld
diff --git a/src/ld_so/ld_script/i686-unknown-redox.ld b/ld_so/ld_script/i686-unknown-redox.ld
similarity index 100%
rename from src/ld_so/ld_script/i686-unknown-redox.ld
rename to ld_so/ld_script/i686-unknown-redox.ld
diff --git a/src/ld_so/ld_script/x86_64-unknown-linux-gnu.ld b/ld_so/ld_script/x86_64-unknown-linux-gnu.ld
similarity index 100%
rename from src/ld_so/ld_script/x86_64-unknown-linux-gnu.ld
rename to ld_so/ld_script/x86_64-unknown-linux-gnu.ld
diff --git a/src/ld_so/ld_script/x86_64-unknown-redox.ld b/ld_so/ld_script/x86_64-unknown-redox.ld
similarity index 100%
rename from src/ld_so/ld_script/x86_64-unknown-redox.ld
rename to ld_so/ld_script/x86_64-unknown-redox.ld
diff --git a/src/ld_so/src/lib.rs b/ld_so/src/lib.rs
similarity index 100%
rename from src/ld_so/src/lib.rs
rename to ld_so/src/lib.rs