diff -r 65bcd7e304cf -r 0330fdcbdd1f master/fsm_master.c
--- a/master/fsm_master.c	Tue Nov 09 11:12:35 2010 +0100
+++ b/master/fsm_master.c	Tue Nov 16 15:32:27 2010 +0100
@@ -48,7 +48,11 @@
 
 /** Time difference [ns] to tolerate without setting a new system time offset.
  */
+#ifdef EC_HAVE_CYCLES
+#define EC_SYSTEM_TIME_TOLERANCE_NS 10000
+#else
 #define EC_SYSTEM_TIME_TOLERANCE_NS 100000000
+#endif
 
 /*****************************************************************************/