diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index 302f8b32..a8333c2b 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 14 21:48:16 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+	* gen_uuid.c: Use clock_reg instead of clock, since clock
+		conflicts with a header file declaration.
+
 Tue Jun 17 01:33:20 1997  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
 	* Release of E2fsprogs 1.11
diff --git a/lib/uuid/gen_uuid.c b/lib/uuid/gen_uuid.c
index a0c815b6..61c3eed2 100644
--- a/lib/uuid/gen_uuid.c
+++ b/lib/uuid/gen_uuid.c
@@ -151,7 +151,7 @@ static int get_clock(__u32 *clock_high, __u32 *clock_low, __u16 *ret_clock_seq)
 	static struct timeval		last = {0, 0};
 	static __u16			clock_seq;
 	struct timeval 			tv;
-	unsigned long long		clock;
+	unsigned long long		clock_reg;
 	
 try_again:
 	gettimeofday(&tv, 0);
@@ -174,12 +174,12 @@ try_again:
 	} else
 		adjustment = 0;
 	
-	clock = tv.tv_usec*10 + adjustment;
-	clock += ((unsigned long long) tv.tv_sec)*10000000;
-	clock += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
+	clock_reg = tv.tv_usec*10 + adjustment;
+	clock_reg += ((unsigned long long) tv.tv_sec)*10000000;
+	clock_reg += (((unsigned long long) 0x01B21DD2) << 32) + 0x13814000;
 
-	*clock_high = clock >> 32;
-	*clock_low = clock;
+	*clock_high = clock_reg >> 32;
+	*clock_low = clock_reg;
 	*ret_clock_seq = clock_seq;
 	return 0;
 }