diff --git a/hermit/arch/x86/kernel/processor.c b/hermit/arch/x86/kernel/processor.c
index 36b87b8e1..9a132074c 100644
--- a/hermit/arch/x86/kernel/processor.c
+++ b/hermit/arch/x86/kernel/processor.c
@@ -182,14 +182,14 @@ uint32_t detect_cpu_frequency(void)
 
 	rmb();
 	start = rdtsc();
-	/* wait a second to determine the frequency */
-	while(get_clock_tick() - ticks < TIMER_FREQ)
+	/* wait 3 ticks to determine the frequency */
+	while(get_clock_tick() - ticks < 3)
 		PAUSE;
 	rmb();
 	end = rdtsc();
 
 	diff = end > start ? end - start : start - end;
-	cpu_freq = (uint32_t) (diff / (uint64_t) 1000000);
+	cpu_freq = (uint32_t) ((TIMER_FREQ*diff) / (1000000ULL*3ULL));
 
 	return cpu_freq;
 }