diff --git a/main/postmarketos-base/APKBUILD b/main/postmarketos-base/APKBUILD
index 1270ffb37..cb13e214a 100644
--- a/main/postmarketos-base/APKBUILD
+++ b/main/postmarketos-base/APKBUILD
@@ -1,12 +1,13 @@
 pkgname=postmarketos-base
 pkgver=3
-pkgrel=8
+pkgrel=9
 pkgdesc="Meta package for minimal postmarketOS base"
 url="https://github.com/postmarketOS"
 arch="noarch"
 license="GPL3+"
 depends="
 	alpine-base
+	chrony
 	cryptsetup
 	eudev
 	haveged
@@ -67,4 +68,4 @@ sha512sums="38dc75c0ed32b76dccd3d8e7e8173e8b7d91847cf2b07123f376b95af46b4f89798b
 3ceeee37f558e7c95ad973692b6a437f997e6b46c3d1c2257ddfb1529a5633477373aa123c7f08164e818daae50acb203d151379f27ca11bd458809e6a0d4de7  swapfile
 f5cc0f1265955d2646e5f099dd4b5d4c287945bfc18c16044db57670d456f55c678fc11cc59e6dab3fa340832ce869d516302a3a35c13518539ed0cedca51819  swapfile.init
 e0d2d48b82a03239a4c0a00acaf83e00d397c23a8d7c71053d4e2a383357c22dcedef9e81b0e12a1d7514e1fdbe0bb3eb82613d18b29034a7ce5447f13c84a53  swapfile.conf
-4f00ad8ce8533fb884b083c094adada26ef845718a229e3ae94986997997297d9bec073babbe8829c29d28aaf31a01ebf28c041395ae7d8631be574b88059e34  postmarketos-base.post-install"
+2550a40f44e593bd6c2fafcf27464470d0cc97b1de9ad712c4a167b3ae6cef015a8ba9249176e446bb7852c0d881d3f02a9eba60f4ac655462bc4016026e51e6  postmarketos-base.post-install"
diff --git a/main/postmarketos-base/postmarketos-base.post-install b/main/postmarketos-base/postmarketos-base.post-install
index 2bb7fadb0..2d0290c18 100644
--- a/main/postmarketos-base/postmarketos-base.post-install
+++ b/main/postmarketos-base/postmarketos-base.post-install
@@ -13,7 +13,7 @@ done
 for service in hwclock modules sysctl hostname bootmisc swclock syslog; do
 	rc-update -q add $service boot
 done
-for service in dbus haveged sshd swapfile wpa_supplicant; do
+for service in dbus haveged sshd swapfile wpa_supplicant chronyd; do
 	rc-update -q add $service default
 done
 for service in mount-ro killprocs savecache; do
@@ -76,3 +76,8 @@ sed -i 's/# %wheel ALL=(ALL) ALL/%wheel ALL=(ALL) ALL/' /etc/sudoers
 # Add user to video group for proper framebuffer permissions
 username="$(getent passwd 1000 | cut -d ":" -f 1)"
 usermod -a -G video "$username"
+
+# Set chrony to quickly correct system time on first boot, if necessary
+if ! grep -q "makestep" /etc/chrony/chrony.conf; then
+	echo "makestep 1 -1" >> /etc/chrony/chrony.conf
+fi