--- rc.sysinit.orig	2006-12-18 12:44:20.000000000 +0200
+++ rc.sysinit	2006-12-18 12:47:38.000000000 +0200
@@ -150,12 +150,12 @@
 status "Mounting Root Read-only" /bin/mount -n -o remount,ro /
 
 # Set clock early to fix some bugs with filesystem checks
-# Clock is set again later to match rc.conf
+# /etc/localtime should be set already
 if [ -f /etc/localtime ]; then
 	if [ "$HARDWARECLOCK" = "UTC" ]; then
-		/sbin/hwclock --directisa --utc --hctosys
+		/sbin/hwclock --directisa --utc --hctosys --noadjfile
 	else
-		/sbin/hwclock --directisa --localtime --hctosys
+		/sbin/hwclock --directisa --localtime --hctosys --noadjfile
 	fi
 fi
 
@@ -229,17 +229,14 @@
 status "Activating Swap" /sbin/swapon -a
 
 stat_busy "Configuring System Clock"
-if [ "$TIMEZONE" != "" ]; then
-	/bin/ln -sf /usr/share/zoneinfo/$TIMEZONE /etc/localtime
+if [ ! -f /var/lib/hwclock/adjtime ]; then
+	echo "0.0 0 0.0" > /var/lib/hwclock/adjtime
 fi
 if [ "$HARDWARECLOCK" = "UTC" ]; then
 	/sbin/hwclock --directisa --utc --hctosys
 else
 	/sbin/hwclock --directisa --localtime --hctosys
 fi
-if [ ! -f /var/lib/hwclock/adjtime ]; then
-	echo "0.0 0 0.0" > /var/lib/hwclock/adjtime
-fi
 stat_done
 
 if [ -f /var/run/random-seed ]; then
--- rc.shutdown.orig	2006-12-18 12:43:05.000000000 +0200
+++ rc.shutdown	2006-12-18 12:48:29.000000000 +0200
@@ -55,6 +55,10 @@
 stat_done
 
 stat_busy "Saving System Clock"
+if [ "$TIMEZONE" != "" ]; then
+	/bin/rm -f /etc/localtime
+	/bin/cp /usr/share/zoneinfo/$TIMEZONE /etc/localtime
+fi
 if [ "$HARDWARECLOCK" = "UTC" ]; then
 	/sbin/hwclock --directisa --utc --systohc
 else