diff --git a/.gitignore b/.gitignore
index ce5df9d..26ea3e7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ mkfs
 kernel/kernel
 user/usys.S
 .gdbinit
+target/
diff --git a/Makefile b/Makefile
index 62bca73..2e28226 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 K=kernel
+R=$K/rustkernel
 U=user
 P=programs
 
@@ -12,7 +13,6 @@ OBJS = \
   $K/spinlock.o \
   $K/string.o \
   $K/main.o \
-  $K/rust.a \
   $K/vm.o \
   $K/proc.o \
   $K/swtch.o \
@@ -64,10 +64,7 @@ CFLAGS += -mcmodel=medany
 CFLAGS += -ffreestanding -fno-common -nostdlib -mno-relax
 CFLAGS += -I.
 CFLAGS += $(shell $(CC) -fno-stack-protector -E -x c /dev/null >/dev/null 2>&1 && echo -fno-stack-protector)
-
-RUSTC = rustc
 TARGET_TRIPLE = riscv64gc-unknown-none-elf
-RUSTFLAGS = -C soft-float=n --target $(TARGET_TRIPLE)
 
 # Disable PIE when possible (for Ubuntu 16.10 toolchain)
 ifneq ($(shell $(CC) -dumpspecs 2>/dev/null | grep -e '[^f]no-pie'),)
@@ -79,8 +76,9 @@ endif
 
 LDFLAGS = -z max-page-size=4096
 
-$K/kernel: $(OBJS) $K/kernel.ld $U/initcode
-	$(LD) $(LDFLAGS) -T $K/kernel.ld -o $K/kernel $(OBJS) 
+$K/kernel: $(OBJS) $K/kernel.ld $U/initcode $R/src
+	cargo +nightly -Z unstable-options -C $R build
+	$(LD) $(LDFLAGS) -T $K/kernel.ld -o $K/kernel $(OBJS) $R/target/$(TARGET_TRIPLE)/debug/librustkernel.a
 	$(OBJDUMP) -S $K/kernel > $K/kernel.asm
 	$(OBJDUMP) -t $K/kernel | sed '1,/SYMBOL TABLE/d; s/ .* / /; /^$$/d' > $K/kernel.sym
 
@@ -95,8 +93,8 @@ tags: $(OBJS) _init
 
 ULIB = $U/ulib.o $U/usys.o $U/printf.o $U/umalloc.o
 
-%.a: %.rs
-	$(RUSTC) $(RUSTFLAGS) --crate-type staticlib -o $@ -L $K $^
+# %.a: %.rs
+# 	$(RUSTC) $(RUSTFLAGS) --crate-type staticlib -o $@ -L $K $^
 
 %.o: %.c *.h
 	$(CC) $(CFLAGS) -c $^
@@ -157,6 +155,7 @@ clean:
 	mkfs/mkfs .gdbinit \
         $U/usys.S \
 	$(UPROGS)
+	cargo +nightly -Z unstable-options -C $R clean
 
 # try to generate a unique GDB port
 GDBPORT = $(shell expr `id -u` % 5000 + 25000)
diff --git a/kernel/rustkernel/.cargo/config.toml b/kernel/rustkernel/.cargo/config.toml
new file mode 100644
index 0000000..7f9fa99
--- /dev/null
+++ b/kernel/rustkernel/.cargo/config.toml
@@ -0,0 +1,3 @@
+[build]
+target = "riscv64gc-unknown-none-elf"
+rustflags = ["-Csoft-float=n"]
diff --git a/kernel/rustkernel/Cargo.lock b/kernel/rustkernel/Cargo.lock
new file mode 100644
index 0000000..516fd1e
--- /dev/null
+++ b/kernel/rustkernel/Cargo.lock
@@ -0,0 +1,7 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "rustkernel"
+version = "0.1.0"
diff --git a/kernel/rustkernel/Cargo.toml b/kernel/rustkernel/Cargo.toml
new file mode 100644
index 0000000..25087f9
--- /dev/null
+++ b/kernel/rustkernel/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "rustkernel"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+
+[lib]
+crate-type = ["staticlib"]
diff --git a/kernel/rust.rs b/kernel/rustkernel/src/lib.rs
similarity index 80%
rename from kernel/rust.rs
rename to kernel/rustkernel/src/lib.rs
index 3cc2dcd..60e595b 100644
--- a/kernel/rust.rs
+++ b/kernel/rustkernel/src/lib.rs
@@ -4,7 +4,7 @@
 use core::ffi::{c_char, CStr};
 
 extern "C" {
-    fn print(message: *const c_char);
+    pub fn print(message: *const c_char);
     fn panic(panic_message: *const c_char) -> !;
 }
 
@@ -12,7 +12,7 @@ extern "C" {
 pub extern "C" fn rust_main() {
     unsafe {
         print(
-            CStr::from_bytes_with_nul(b"Hello from Rust!\0")
+            CStr::from_bytes_with_nul(b"Hello from Rust!\n\0")
                 .unwrap()
                 .as_ptr(),
         );