diff -urN ref/arch/alpha/kernel/time.c nanosleep/arch/alpha/kernel/time.c
--- ref/arch/alpha/kernel/time.c	Thu Feb 24 20:47:58 2000
+++ nanosleep/arch/alpha/kernel/time.c	Thu Feb 24 20:48:50 2000
@@ -326,6 +326,20 @@
 	irq_handler = timer_interrupt;
 	if (request_irq(TIMER_IRQ, irq_handler, 0, "timer", NULL))
 		panic("Could not allocate timer IRQ!");
+	do_get_fast_time = do_gettimeofday;
+}
+
+static inline void
+timeval_normalize(struct timeval * tv)
+{
+	time_t __sec;
+
+	__sec = tv->tv_usec / 1000000;
+	if (__sec)
+	{
+		tv->tv_usec %= 1000000;
+		tv->tv_sec += __sec;
+	}
 }
 
 /*
@@ -376,13 +390,11 @@
 #endif
 
 	usec += delta_usec;
-	if (usec >= 1000000) {
-		sec += 1;
-		usec -= 1000000;
-	}
 
 	tv->tv_sec = sec;
 	tv->tv_usec = usec;
+
+	timeval_normalize(tv);
 }
 
 void
diff -urN ref/arch/i386/kernel/time.c nanosleep/arch/i386/kernel/time.c
--- ref/arch/i386/kernel/time.c	Thu Feb 24 20:47:58 2000
+++ nanosleep/arch/i386/kernel/time.c	Thu Feb 24 20:46:31 2000
@@ -231,6 +231,20 @@
 
 #endif
 
+/* FIXME: should be inline but gcc is buggy and breaks */
+static void
+timeval_normalize(struct timeval * tv)
+{
+	time_t __sec;
+
+	__sec = tv->tv_usec / 1000000;
+	if (__sec)
+	{
+		tv->tv_usec %= 1000000;
+		tv->tv_sec += __sec;
+	}
+}
+
 /*
  * This version of gettimeofday has microsecond resolution
  * and better than microsecond precision on fast x86 machines with TSC.
@@ -252,13 +266,10 @@
 	usec += xtime.tv_usec;
 	read_unlock_irqrestore(&xtime_lock, flags);
 
-	while (usec >= 1000000) {
-		usec -= 1000000;
-		sec++;
-	}
-
 	tv->tv_sec = sec;
 	tv->tv_usec = usec;
+
+	timeval_normalize(tv);
 }
 
 void do_settimeofday(struct timeval *tv)
diff -urN ref/arch/ppc/kernel/time.c nanosleep/arch/ppc/kernel/time.c
--- ref/arch/ppc/kernel/time.c	Thu Feb 24 20:47:59 2000
+++ nanosleep/arch/ppc/kernel/time.c	Thu Feb 24 20:49:10 2000
@@ -139,6 +139,19 @@
 	hardirq_exit(cpu);
 }
 
+static inline void
+timeval_normalize(struct timeval * tv)
+{
+	time_t __sec;
+
+	__sec = tv->tv_usec / 1000000;
+	if (__sec)
+	{
+		tv->tv_usec %= 1000000;
+		tv->tv_sec += __sec;
+	}
+}
+
 /*
  * This version of gettimeofday has microsecond resolution.
  */
@@ -153,10 +166,7 @@
 #ifndef __SMP__
 	tv->tv_usec += (decrementer_count - get_dec())
 	    * count_period_num / count_period_den;
-	if (tv->tv_usec >= 1000000) {
-		tv->tv_usec -= 1000000;
-		tv->tv_sec++;
-	}
+	timeval_normalize(tv);
 #endif
 	restore_flags(flags);
 }
diff -urN ref/include/linux/time.h nanosleep/include/linux/time.h
--- ref/include/linux/time.h	Thu Feb 24 20:47:59 2000
+++ nanosleep/include/linux/time.h	Thu Feb 24 20:45:57 2000
@@ -46,10 +46,53 @@
 	value->tv_sec = jiffies / HZ;
 }
  
+static __inline__ int
+timespec_before(struct timespec a, struct timespec b)
+{
+	if (a.tv_sec == b.tv_sec)
+		return a.tv_nsec < b.tv_nsec;
+	return a.tv_sec < b.tv_sec;
+}
+
+/* computes `a - b'  and write the result in `result', assumes `a >= b' */
+static inline void
+timespec_less(struct timespec a, struct timespec b, struct timespec * result)
+{
+	if (a.tv_nsec < b.tv_nsec)
+	{
+		a.tv_sec--;
+		a.tv_nsec += 1000000000;
+	}
+
+	result->tv_sec = a.tv_sec - b.tv_sec;
+	result->tv_nsec = a.tv_nsec - b.tv_nsec;
+}
+
 struct timeval {
 	time_t		tv_sec;		/* seconds */
 	suseconds_t	tv_usec;	/* microseconds */
 };
+
+/* computes `a - b'  and write the result in `result', assumes `a >= b' */
+static inline void
+timeval_less(struct timeval a, struct timeval b, struct timeval * result)
+{
+	if (a.tv_usec < b.tv_usec)
+	{
+		a.tv_sec--;
+		a.tv_usec += 1000000;
+	}
+
+	result->tv_sec = a.tv_sec - b.tv_sec;
+	result->tv_usec = a.tv_usec - b.tv_usec;
+}
+
+static __inline__ void
+timeval_to_timespec(struct timeval tv, struct timespec * ts)
+{
+	ts->tv_sec = tv.tv_sec;
+	ts->tv_nsec = (long) tv.tv_usec * 1000;
+}
 
 struct timezone {
 	int	tz_minuteswest;	/* minutes west of Greenwich */
diff -urN ref/kernel/sched.c nanosleep/kernel/sched.c
--- ref/kernel/sched.c	Thu Feb 24 20:47:59 2000
+++ nanosleep/kernel/sched.c	Thu Feb 24 20:41:08 2000
@@ -1879,6 +1879,7 @@
 {
 	struct timespec t;
 	unsigned long expire;
+	struct timeval before, after;
 
 	if(copy_from_user(&t, rqtp, sizeof(struct timespec)))
 		return -EFAULT;
@@ -1903,11 +1904,20 @@
 	expire = timespec_to_jiffies(&t) + (t.tv_sec || t.tv_nsec);
 
 	current->state = TASK_INTERRUPTIBLE;
+	get_fast_time(&before);
 	expire = schedule_timeout(expire);
+	get_fast_time(&after);
 
 	if (expire) {
 		if (rmtp) {
-			jiffies_to_timespec(expire, &t);
+			struct timespec elapsed;
+
+			timeval_less(after, before, &after);
+			timeval_to_timespec(after, &elapsed);
+			if (timespec_before(elapsed, t))
+				timespec_less(t, elapsed, &t);
+			else
+				t.tv_nsec = t.tv_sec = 0;
 			if (copy_to_user(rmtp, &t, sizeof(struct timespec)))
 				return -EFAULT;
 		}