diff --git a/distro-files/etc/local.d/firstboot.start b/distro-files/etc/local.d/firstboot.start
index fa8adc4b..04711375 100755
--- a/distro-files/etc/local.d/firstboot.start
+++ b/distro-files/etc/local.d/firstboot.start
@@ -1,4 +1,15 @@
 if [ ! -f "/var/lib/.first_boot_done" ] ; then
+	if [ ! -s /etc/machine-id ]; then
+		machine_id=$(od -An -N16 -tx1 /dev/urandom | tr -d ' \n')
+		if [ "${#machine_id}" -ne 32 ]; then
+			echo "Failed to generate /etc/machine-id" >&2
+			exit 1
+		fi
+
+		printf '%s\n' "$machine_id" > /etc/machine-id
+		chmod 444 /etc/machine-id
+	fi
+
 	mkdir -p /var/log
 	xbps-reconfigure -a > /var/log/first_install_reconfigure.log
 
diff --git a/recipes/distro-files b/recipes/distro-files
index 5b697f5a..c6a29b97 100644
--- a/recipes/distro-files
+++ b/recipes/distro-files
@@ -1,5 +1,5 @@
 name=distro-files
-revision=8
+revision=9
 from_source=distro-files
 
 package() {