diff --git a/.gitmodules b/.gitmodules
index 16b9f4f..ffbef5c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -16,3 +16,6 @@
 [submodule "rust"]
 	path = rust
 	url = https://github.com/redox-os/rust.git
+[submodule "redoxfs"]
+	path = redoxfs
+	url = https://github.com/redox-os/redoxfs.git
diff --git a/Makefile b/Makefile
index 7c3d6f1..001d0ad 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ clean:
 	cd cookbook && ./clean.sh
 	cargo clean --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo clean --manifest-path installer/Cargo.toml
-	cargo clean --manifest-path installer/redoxfs/Cargo.toml
 	cargo clean --manifest-path kernel/Cargo.toml
+	cargo clean --manifest-path redoxfs/Cargo.toml
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf build
 
@@ -27,8 +27,8 @@ pull:
 update:
 	cargo update --manifest-path cookbook/pkgutils/Cargo.toml
 	cargo update --manifest-path installer/Cargo.toml
-	cargo update --manifest-path installer/redoxfs/Cargo.toml
 	cargo update --manifest-path kernel/Cargo.toml
+	cargo update --manifest-path redoxfs/Cargo.toml
 
 # Emulation recipes
 include mk/qemu.mk
diff --git a/installer b/installer
index f99fac3..d6f2936 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit f99fac30ea7bd69f04e6f2ac67bf4d197c7b91de
+Subproject commit d6f2936a5337b3c613483ea428dc6c4571e5357c
diff --git a/mk/filesystem.mk b/mk/filesystem.mk
index 8e9b0bc..71c5b61 100644
--- a/mk/filesystem.mk
+++ b/mk/filesystem.mk
@@ -2,10 +2,10 @@ build/filesystem.bin: filesystem.toml build/kernel
 	-$(FUMOUNT) build/filesystem/ || true
 	rm -rf $@  $@.partial build/filesystem/
 	dd if=/dev/zero of=$@.partial bs=1048576 count=512
-	cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@.partial
+	cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs-mkfs $@.partial
 	mkdir -p build/filesystem/
-	cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs
-	cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/
+	cargo build --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs
+	cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs -- $@.partial build/filesystem/
 	sleep 2
 	pgrep redoxfs
 	cp build/kernel build/filesystem/kernel
@@ -32,8 +32,8 @@ build/filesystem.bin: filesystem.toml build/kernel
 
 mount: FORCE
 	mkdir -p build/filesystem/
-	cargo build --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs
-	cargo run --manifest-path installer/redoxfs/Cargo.toml --quiet --release --bin redoxfs -- build/harddrive.bin build/filesystem/
+	cargo build --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs
+	cargo run --manifest-path redoxfs/Cargo.toml --quiet --release --bin redoxfs -- build/harddrive.bin build/filesystem/
 	sleep 2
 	pgrep redoxfs
 
diff --git a/redoxfs b/redoxfs
new file mode 160000
index 0000000..97652cc
--- /dev/null
+++ b/redoxfs
@@ -0,0 +1 @@
+Subproject commit 97652cc6f85bc31a556706d882554a8b71299807