diff --git a/user/qubes-vm-core/APKBUILD b/user/qubes-vm-core/APKBUILD
index 7de130f..a352a67 100644
--- a/user/qubes-vm-core/APKBUILD
+++ b/user/qubes-vm-core/APKBUILD
@@ -9,7 +9,7 @@ subpackages="
 	$pkgname-doc
 	"
 pkgver=4.1.39
-pkgrel=0
+pkgrel=1
 _gittag="v$pkgver"
 pkgdesc="The Qubes core files for installation inside a Qubes VM."
 arch="x86_64"
@@ -68,6 +68,7 @@ source="
 	qubes-sysinit.openrc
 	qubes-updates-proxy-forwarder.openrc
 	qubes-updates-proxy.openrc
+	qvm-sync-clock.sh
 	"
 builddir="$srcdir"/qubes-core-agent-linux-${_gittag/v}
 
@@ -104,8 +105,8 @@ package() {
 	make -C qubes-rpc/nautilus DESTDIR="$pkgdir" install
 	make -C qubes-rpc/thunar DESTDIR="$pkgdir" install
 	make -C network DESTDIR="$pkgdir" install
-
 	install -Dm755 "$builddir"/network/update-proxy-configs "$pkgdir"/usr/lib/qubes/.
+	install -Dm755 "$srcdir"/qvm-sync-clock.sh "$pkgdir"/etc/qubes/suspend-post.d/.
 
 	for i in $source; do
 		case $i in
@@ -158,10 +159,11 @@ sha512sums="
 2ac642946ed6ca12857d7d88ec54bb293ca5f9fe99c79fceffd4717bbcc0265367bc1cfbddd0ec52cd1a0dc714a3f2978aa08c32199e76d761c53910ae1d5908  qubes-vm-core-v4.1.39.tar.gz
 95c080a593ca1cd457ffafc0cdd6ee28999c72f67191a3955b6081a4a7d287cae4cd0c626139562e5e1eb55516c25402a174e3599daf7d4cb259d6b4bbdff155  qubes-core-early.openrc
 61529413a16b7fa0df691c24adc41b90477c01ea70d572921ecec89df23932e5a2e60c4e73b9a84181dc30424e2e6af4ad1c7dcf6c42689c3cc346a9923d6e07  qubes-core-netvm.openrc
-956747d857c3c5c5e580c651066fb837511280accd8973ec370232239cb351852644e8fcc44826c065ce836b5aea5d64d4b30c29dfb7c4dd8078a5e358889502  qubes-core.openrc
+da8e293520f5fce29ce76d7586e8ce1a4164798a1214079fb554c690264da1d774fdad3f45825aac52c2c3a0b0cfd39df73eb33394dedd7c043fe0f2344b90ca  qubes-core.openrc
 8f1ea1b6bfb4d3089a51cc3e325861ee7b644f743b2652bf61789933adedefdbc743a61567ad980d2a6077647eb61570b68a056125abaab2a67166d249a961b0  qubes-firewall.openrc
 437a3dc443c5b0311c5dc8f792739eef89e38b2e854b9a5bb248211dd0eb0f26c1d79588ca2b4b63236b8bed0d735be6b2265d8328885730a8aa5f854301d61f  qubes-iptables.openrc
 e9096560e4ee4cad836b686e18eb6dbac729227683eda2f0c8b3541c909f64de3489dbb66e3752014deab69cbfae7885bc15b9bb7e3942c02e40328337b9ef30  qubes-sysinit.openrc
 b1e8af2335955e52cf1817c56296f94f8c472e68d7a17a28f516fe4f5fa8a8053d4f9333efbb007a82a06f9442a4a6cfe5f9c751de07f337e47ee04cb18b9395  qubes-updates-proxy-forwarder.openrc
 29d316b9f48cad15f6e22aaa67b228a5e4893ded86463dbe25b3cc68301b961473e79c01f003b1665e217ad4af2e618625442250d5607c1c16462e3f5eed069c  qubes-updates-proxy.openrc
+cca9f49422fa25cd5f3942dce8edd3ecff080bf5c407a7a790b438bedea054f39a4a3d8c179b44c4c08fc490b597e14d00dad9b0240861e83957e0af7aa6475d  qvm-sync-clock.sh
 "
diff --git a/user/qubes-vm-core/qubes-core.openrc b/user/qubes-vm-core/qubes-core.openrc
index 401b99e..03c0721 100755
--- a/user/qubes-vm-core/qubes-core.openrc
+++ b/user/qubes-vm-core/qubes-core.openrc
@@ -21,7 +21,7 @@ start()
 	/usr/lib/qubes/setup-ip add eth0 2>&1 | tee -a "$error_log"
 
 	echo "Syncing clock" | tee -a "$error_log"
-	/usr/bin/qvm-sync-lock | tee -a "$error_log"
+	/usr/bin/qvm-sync-clock | tee -a "$error_log"
 }
 
 stop()
diff --git a/user/qubes-vm-core/qvm-sync-clock.sh b/user/qubes-vm-core/qvm-sync-clock.sh
new file mode 100755
index 0000000..bd616f6
--- /dev/null
+++ b/user/qubes-vm-core/qvm-sync-clock.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ ! -f /var/run/qubes-service/clocksync ]; then
+    # https://github.com/QubesOS/qubes-issues/issues/7265
+    /usr/bin/qvm-sync-clock
+fi