diff --git a/helpers/DATA/apt-setup/50mirror.trisquel b/helpers/DATA/apt-setup/50mirror.trisquel
index 052f10b..28d603d 100755
--- a/helpers/DATA/apt-setup/50mirror.trisquel
+++ b/helpers/DATA/apt-setup/50mirror.trisquel
@@ -77,8 +77,6 @@ fi
 : "${ROOT:=/target}"
 SD="$ROOT/etc/apt/sources.list.d"
 SF="$SD/trisquel.sources"
-LEGACY="$ROOT/etc/apt/sources.list"
-MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
 mkdir -p "$SD"
 
 # Use keyring in /usr/share/keyrings
@@ -113,15 +111,12 @@ Components: main
 Signed-By: ${SIGNED_BY}
 EOF
 
+# Set legacy format for apt-setup to apply updates correctly.
 {
     echo "deb ${uri} ${codename} main"
     echo "deb ${uri} ${codename}-updates main"
     echo "deb ${uri} ${codename}-security main"
 } >> "$file"
 
-# Keep the legacy file and the pipeline temp file as a single breadcrumb line
-printf '%s\n' "$MSG" > "$LEGACY"
-printf '%s\n' "$MSG" >> "$file"
-
 exit 0
 
diff --git a/helpers/DATA/apt-setup/99deb822-breadcrumb b/helpers/DATA/apt-setup/99deb822-breadcrumb
new file mode 100755
index 0000000..e1ed2ad
--- /dev/null
+++ b/helpers/DATA/apt-setup/99deb822-breadcrumb
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -e
+. /usr/share/debconf/confmodule
+
+file="$1"
+ROOT="${ROOT:-/target}"
+LEGACY="$ROOT/etc/apt/sources.list"
+SD="$ROOT/etc/apt/sources.list.d"
+
+# If .sources exist, leave sources.list reduced only as a breadcrumb
+if ls "$SD"/*.sources >/dev/null 2>&1; then
+    MSG="# Trisquel sources have moved to /etc/apt/sources.list.d/trisquel.sources"
+    printf '%s\n' "$MSG" > "$LEGACY"
+    printf '%s\n' "$MSG" > "$file"
+fi
+
+exit 0
diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 0fa722d..15ab5f8 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -18,7 +18,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=4.4
+VERSION=4.5
 EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=78DBA3BC47EF2265
 NETINST=true
@@ -80,10 +80,14 @@ rm generators/9[1-9]* generators/50mirror
 find generators -name 50mirror.ubuntu | xargs -r rm
 sed -i '/generators\/9[1-9]*/d' debian/apt-setup-udeb.install
 
-echo "generators/50mirror.trisquel usr/lib/apt-setup/generators
-release-files/archive.trisquel.org usr/share/apt-setup/release-files" > debian/apt-mirror-setup.install
+cat << EOF > debian/apt-mirror-setup.install
+generators/50mirror.trisquel usr/lib/apt-setup/generators
+generators/99deb822-breadcrumb usr/lib/apt-setup/generators
+release-files/archive.trisquel.org usr/share/apt-setup/release-files
+EOF
 
 cp $DATA/50mirror.trisquel generators/
+cp $DATA/99deb822-breadcrumb generators/
 
 #sed '/The partner/,/^*/d; s/services-select-ubuntu/services-select-trisquel/' -i debian/apt-setup-udeb.templates
 sed 's/services-select/services-select-trisquel/' -i debian/apt-setup-udeb.templates