diff -Nru live-build-20250505/debian/changelog live-build-20250505+deb13u1/debian/changelog
--- live-build-20250505/debian/changelog	2025-05-05 13:55:03.000000000 +0100
+++ live-build-20250505+deb13u1/debian/changelog	2025-08-14 20:27:49.000000000 +0100
@@ -1,3 +1,11 @@
+live-build (1:20250505+deb13u1) trixie; urgency=medium
+
+  * Remove os-release diversions once rootfs creation is finished
+    (Closes: #1111039)
+  * Install live-specific os-release only with --system live
+
+ -- Luca Boccassi <bluca@debian.org>  Thu, 14 Aug 2025 20:27:49 +0100
+
 live-build (1:20250505) unstable; urgency=medium
 
   [ Roland Clobus ]
diff -Nru live-build-20250505/manpages/.gitignore live-build-20250505+deb13u1/manpages/.gitignore
--- live-build-20250505/manpages/.gitignore	2025-05-05 13:55:03.000000000 +0100
+++ live-build-20250505+deb13u1/manpages/.gitignore	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-po4a.cfg
-fr/
-ja/
diff -Nru live-build-20250505/scripts/build/bootstrap_debootstrap live-build-20250505+deb13u1/scripts/build/bootstrap_debootstrap
--- live-build-20250505/scripts/build/bootstrap_debootstrap	2025-05-05 13:55:03.000000000 +0100
+++ live-build-20250505+deb13u1/scripts/build/bootstrap_debootstrap	2025-08-14 20:27:49.000000000 +0100
@@ -123,7 +123,7 @@
 fi
 
 # If there's an os-release file, copy it to /etc/ and add some extra fields that identify the live image
-if [ -e chroot/usr/lib/os-release ]; then
+if [ "${LB_SYSTEM}" = "live" ] && [ -e chroot/usr/lib/os-release ]; then
 	# Ensure a potential update doesn't clobber our changes
 	if ! Chroot chroot dpkg-divert --list /etc/os-release | grep -q /etc/os-release; then
 		Chroot chroot dpkg-divert --quiet --local --add --no-rename --divert /etc/os-release.debootstrap /etc/os-release
diff -Nru live-build-20250505/scripts/build/chroot_hacks live-build-20250505+deb13u1/scripts/build/chroot_hacks
--- live-build-20250505/scripts/build/chroot_hacks	2025-05-05 13:55:03.000000000 +0100
+++ live-build-20250505+deb13u1/scripts/build/chroot_hacks	2025-08-14 20:27:31.000000000 +0100
@@ -59,6 +59,11 @@
 		;;
 esac
 
+# Now that all packages are installed, remove the os-release divert as it's safe to do so
+if Chroot chroot dpkg-divert --list /etc/os-release | grep -q os-release.debootstrap; then
+	Chroot chroot dpkg-divert --quiet --local --remove --no-rename /etc/os-release
+fi
+
 # Update initramfs (always, because of udev rules in initrd)
 case "${LB_INITRAMFS}" in
 	live-boot)
diff -Nru live-build-20250505/test/.gitignore live-build-20250505+deb13u1/test/.gitignore
--- live-build-20250505/test/.gitignore	2025-05-05 13:55:03.000000000 +0100
+++ live-build-20250505+deb13u1/test/.gitignore	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-coverage
-
-# rebuild related folders
-live-build
-debian-installer
-.build
-binary
-cache
-chroot
-config
-
-# rebuild related files
-binary.modified_timestamps
-chroot.files
-chroot.packages.install
-chroot.packages.live
-lb_output.txt
-live-image-amd64.contents
-live-image-amd64.files
-live-image-amd64.hybrid.iso
-live-image-amd64.hybrid.iso.zsync
-live-image-amd64.packages
-