diff --git a/[refs] b/[refs]
index 4fc91a5f6201..370b07164664 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 930fc45a49ddebe7555cc5c837d82b9c27e65ff4
+refs/heads/master: 4b8f573b5db02a3017afbba49026a6aef480174f
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index 3ba10fa35b60..6a2e5f8dc725 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -752,6 +752,15 @@ static void second_overflow(void)
     else
 	time_adj += (time_adj >> 2) + (time_adj >> 5);
 #endif
+#if HZ == 250
+    /* Compensate for (HZ==250) != (1 << SHIFT_HZ).
+     * Add 1.5625% and 0.78125% to get 255.85938; => only 0.05% error (p. 14)
+     */
+    if (time_adj < 0)
+	time_adj -= (-time_adj >> 6) + (-time_adj >> 7);
+    else
+	time_adj += (time_adj >> 6) + (time_adj >> 7);
+#endif
 #if HZ == 1000
     /* Compensate for (HZ==1000) != (1 << SHIFT_HZ).
      * Add 1.5625% and 0.78125% to get 1023.4375; => only 0.05% error (p. 14)