diff --git a/src/instructions.rs b/src/instructions.rs
index 68b43a6..bf942ee 100644
--- a/src/instructions.rs
+++ b/src/instructions.rs
@@ -48,6 +48,7 @@ pub(crate) fn find_and_exec(instr: Instruction, core: &mut Core) -> Option<Instr
         },
         0b01101 => Some(rvi::lui(core, instr)),
         0b11011 => Some(rvi::jal(core, instr)),
+        0b00101 => Some(rvi::auipc(core, instr)),
         _ => None,
     }
 }
diff --git a/src/instructions/rvi.rs b/src/instructions/rvi.rs
index 3aadc10..5c06b62 100644
--- a/src/instructions/rvi.rs
+++ b/src/instructions/rvi.rs
@@ -123,6 +123,12 @@ pub fn jal(core: &mut Core, instr: Instruction) -> InstructionResult {
     InstructionResult::Normal
 }
 
+pub fn auipc(core: &mut Core, instr: Instruction) -> InstructionResult {
+    core.reg_write(instr.rd(), core.pc.wrapping_add(instr.imm_u()));
+    core.advance_pc();
+    InstructionResult::Normal
+}
+
 pub fn beq(core: &mut Core, instr: Instruction) -> InstructionResult {
     if core.reg_read(instr.rs1()) == core.reg_read(instr.rs2()) {
         core.pc = core.pc.wrapping_add(instr.imm_b());