diff --git a/Cargo.toml b/Cargo.toml
index 5670627..5683e19 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
     "drivers/ps2d",
     "drivers/rtl8168d",
     "drivers/vesad",
+    "installer",
     "kernel",
     "programs/acid",
     "programs/binutils",
diff --git a/installer b/installer
index 1abfd39..be092f3 160000
--- a/installer
+++ b/installer
@@ -1 +1 @@
-Subproject commit 1abfd39b8da12b5fa40d48fec66016e981d58f42
+Subproject commit be092f37546dfb2ec297635c0f8e4b040189ca55
diff --git a/mk/userspace/installer.mk b/mk/userspace/installer.mk
new file mode 100644
index 0000000..448da59
--- /dev/null
+++ b/mk/userspace/installer.mk
@@ -0,0 +1,7 @@
+installer: \
+	filesystem/bin/redox_installer
+
+filesystem/bin/redox_installer: installer/Cargo.toml installer/src/** $(BUILD)/libstd.rlib
+	mkdir -p filesystem/bin
+	$(CARGO) rustc --manifest-path $< --bin redox_installer $(CARGOFLAGS) -o $@
+	$(STRIP) $@
diff --git a/mk/userspace/mod.mk b/mk/userspace/mod.mk
index 7a7e503..2d6fc28 100644
--- a/mk/userspace/mod.mk
+++ b/mk/userspace/mod.mk
@@ -3,6 +3,7 @@ userspace: \
 	coreutils \
 	extrautils \
 	games \
+	installer \
 	ion \
 	netutils \
 	orbutils \
@@ -11,6 +12,7 @@ userspace: \
 	schemes \
 	filesystem/bin/acid \
 	filesystem/bin/contain \
+	filesystem/bin/redox_installer \
 	filesystem/bin/smith \
 	filesystem/bin/tar
 
@@ -19,6 +21,7 @@ include mk/userspace/coreutils.mk
 include mk/userspace/drivers.mk
 include mk/userspace/extrautils.mk
 include mk/userspace/games.mk
+include mk/userspace/installer.mk
 include mk/userspace/ion.mk
 include mk/userspace/netutils.mk
 include mk/userspace/orbutils.mk