diff --git a/src/system/kernel/arch/arm64/arch_timer.cpp b/src/system/kernel/arch/arm64/arch_timer.cpp
index 0c81e45c58..a2cd77f6fd 100644
--- a/src/system/kernel/arch/arm64/arch_timer.cpp
+++ b/src/system/kernel/arch/arm64/arch_timer.cpp
@@ -14,10 +14,11 @@
 
 static uint64 sTimerTicksUS;
 static bigtime_t sTimerMaxInterval;
+static uint64 sBootTime;
 
 #define TIMER_ARMED (1)
 #define TIMER_MASKED (2 | 1)
-#define TIMER_IRQ 30
+#define TIMER_IRQ 27
 
 
 void
@@ -26,22 +27,22 @@ arch_timer_set_hardware_timer(bigtime_t timeout)
 	if (timeout > sTimerMaxInterval)
 		timeout = sTimerMaxInterval;
 
-	WRITE_SPECIALREG(CNTP_TVAL_EL0, timeout * sTimerTicksUS);
-	WRITE_SPECIALREG(CNTP_CTL_EL0, TIMER_ARMED);
+	WRITE_SPECIALREG(CNTV_TVAL_EL0, timeout * sTimerTicksUS);
+	WRITE_SPECIALREG(CNTV_CTL_EL0, TIMER_ARMED);
 }
 
 
 void
 arch_timer_clear_hardware_timer()
 {
-	WRITE_SPECIALREG(CNTP_CTL_EL0, TIMER_MASKED);
+	WRITE_SPECIALREG(CNTV_CTL_EL0, TIMER_MASKED);
 }
 
 
 int32
 arch_timer_interrupt(void *data)
 {
-	WRITE_SPECIALREG(CNTP_CTL_EL0, TIMER_MASKED);
+	WRITE_SPECIALREG(CNTV_CTL_EL0, TIMER_MASKED);
 	return timer_interrupt();
 }
 
@@ -52,9 +53,11 @@ arch_init_timer(kernel_args *args)
 	sTimerTicksUS = READ_SPECIALREG(CNTFRQ_EL0) / 1000000;
 	sTimerMaxInterval = INT32_MAX / sTimerTicksUS;
 
-	WRITE_SPECIALREG(CNTP_CTL_EL0, TIMER_MASKED);
+	WRITE_SPECIALREG(CNTV_CTL_EL0, TIMER_MASKED);
 	install_io_interrupt_handler(TIMER_IRQ, &arch_timer_interrupt, NULL, 0);
 
+	sBootTime = READ_SPECIALREG(CNTPCT_EL0);
+
 	return B_OK;
 }
 
@@ -62,5 +65,5 @@ arch_init_timer(kernel_args *args)
 bigtime_t
 system_time(void)
 {
-	return READ_SPECIALREG(CNTPCT_EL0) / sTimerTicksUS;
+	return (READ_SPECIALREG(CNTPCT_EL0) - sBootTime) / sTimerTicksUS;
 }