diff --git a/Makefile b/Makefile
index 552ec444d52f18203529b8b9d26fd33e5c2b3594..203978ea632e4ef1ca1874f5ddf42f121e1ba5aa 100644
--- a/Makefile
+++ b/Makefile
@@ -5,14 +5,12 @@ run: all
 	make -C Kernel/rundir run
 
 all:
-	@echo ">>> $@: libcore source"
-	@+make -C Kernel/ ../libcore/lib.rs --no-print-directory
 	@echo ">>> $@: Graphics"
 	@make -C Graphics/ all
 	@echo ">>> $@: Usermode"
-	@+make -C Usermode/ all --no-print-directory
+	@+make -C Usermode/ xargo --no-print-directory
 	@echo ">>> $@: Kernel"
-	@+make -C Kernel/ all --no-print-directory
+	@+make -C Kernel/ -f Makefile-xargo all --no-print-directory
 
 clean:
 	@echo ">>> $@: Usermode"
@@ -26,7 +24,7 @@ UPDATE:
 	curl https://static.rust-lang.org/rustup/rustup-init.sh -sSf | RUSTUP_HOME=$(abspath .prefix) CARGO_HOME=$(abspath .prefix) sh -s -- --default-toolchain none --no-modify-path -y
 	$(call fn_rustcmd,rustup) update $(RUSTUP_VER)
 	$(call fn_rustcmd,rustup) default $(RUSTUP_VER)
-	curl $(RUSTC_SRC_URL) -o rustc-nightly-src.tar.gz
-	tar -xf rustc-nightly-src.tar.gz --wildcards rustc-nightly-src/src/lib\* rustc-nightly-src/src/stdsimd rustc-nightly-src/vendor/compiler_builtins
-	rm -rf rustc-nightly-src/src/libcompiler_builtins; mv rustc-nightly-src/vendor/compiler_builtins rustc-nightly-src/src/libcompiler_builtins
+#	curl $(RUSTC_SRC_URL) -o rustc-nightly-src.tar.gz
+#	tar -xf rustc-nightly-src.tar.gz --wildcards rustc-nightly-src/src/lib\* rustc-nightly-src/src/stdsimd rustc-nightly-src/vendor/compiler_builtins
+#	rm -rf rustc-nightly-src/src/libcompiler_builtins; mv rustc-nightly-src/vendor/compiler_builtins rustc-nightly-src/src/libcompiler_builtins
 	$(CARGO) install xargo --git https://github.com/thepowersgang/xargo --force
diff --git a/common.mk b/common.mk
index 04cc052c56bbcc22acfffce6b1f6bc971c0c9f2e..354d3ce956b8dcec763f70944b60b2cbbe3a89a5 100644
--- a/common.mk
+++ b/common.mk
@@ -49,5 +49,4 @@ XARGO := XARGO_HOME=$(abspath $(PREFIX)xargo) $(call fn_rustcmd,xargo)
 # NOTE: rustc-src doesn't contain compiler_builtins (which is a crates.io package)
 #RUSTUP_SRC_DIR = $(firstword $(wildcard $(PREFIX)toolchains/nightly-*/lib/rustlib/src/rust/src))/
 RUSTUP_SRC_DIR := $(abspath $(ROOTDIR)/rustc-nightly-src/src)/
-$(warning $(RUSTUP_SRC_DIR))