diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 1d463b6e1..f364aa4b5 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -4906,6 +4906,8 @@ auto_timesetting() {
     fi
     if [[ ! -f ${DESTDIR}/etc/adjtime ]]; then
         echo "0.0 0 0.0" > ${DESTDIR}/etc/adjtime
+        echo "0" >> ${DESTDIR}/etc/adjtime
+        [[ -s /tmp/.hardwareclock ]] && cat /tmp/.hardwareclock >>${DESTDIR}/etc/adjtime
     fi
 }
 
diff --git a/usr/share/archboot/tz/tz b/usr/share/archboot/tz/tz
index 5cb22c521..9240da501 100755
--- a/usr/share/archboot/tz/tz
+++ b/usr/share/archboot/tz/tz
@@ -18,7 +18,7 @@ abort()
     [[ -e /tmp/.hardwareclock ]] && rm -f /tmp/.hardwareclock
     [[ -e /tmp/.tz ]] && rm -f /tmp/.tz
     [[ -e /etc/localtime ]] && rm -f /etc/localtime
-    [[ -e /var/lib/hwclock/adjtime ]] && rm -f /var/lib/hwclock/adjtime
+    [[ -e /etc/adjtime ]] && rm -f /etc/adjtime
     [[ -e /tmp/.tz-running ]] && rm /tmp/.tz-running
     clear
     exit 1
@@ -40,12 +40,13 @@ if [[ "${HARDWARECLOCK}" = "UTC" ]]; then
     echo UTC > /tmp/.hardwareclock
 else
     HWCLOCK_PARAMS="${HWCLOCK_PARAMS} --localtime"
-    echo localtime > /tmp/.hardwareclock
+    echo LOCAL > /tmp/.hardwareclock
 fi
 
-[[ ! -d /var/lib/hwclock ]] && mkdir -p /var/lib/hwclock
-if [[ ! -f /var/lib/hwclock/adjtime ]]; then
-    echo "0.0 0 0.0" > /var/lib/hwclock/adjtime
+if [[ ! -f /etc/adjtime ]]; then
+    echo "0.0 0 0.0" > /etc/adjtime
+    echo "0" >> /etc/adjtime
+    [[ -s /tmp/.hardwareclock ]] && cat /tmp/.hardwareclock >>/etc/adjtime
 fi
 hwclock ${HWCLOCK_PARAMS}
 }