diff --git a/data/debian-cd/sid b/data/debian-cd/sid
index 20f08b4f4..f0b7e3289 120000
--- a/data/debian-cd/sid
+++ b/data/debian-cd/sid
@@ -1 +1 @@
-squeeze
\ No newline at end of file
+trixie
\ No newline at end of file
diff --git a/data/debian-cd/testing b/data/debian-cd/testing
new file mode 120000
index 000000000..f0b7e3289
--- /dev/null
+++ b/data/debian-cd/testing
@@ -0,0 +1 @@
+trixie
\ No newline at end of file
diff --git a/data/debian-cd/trixie/README b/data/debian-cd/trixie/README
new file mode 100644
index 000000000..454439c0d
--- /dev/null
+++ b/data/debian-cd/trixie/README
@@ -0,0 +1,2 @@
+This is a manual copy of the exclude lists is debian-cd/data
+https://salsa.debian.org/images-team/debian-cd
diff --git a/data/debian-cd/trixie/amd64_businesscard_udeb_include b/data/debian-cd/trixie/amd64_businesscard_udeb_include
new file mode 100644
index 000000000..0089df09a
--- /dev/null
+++ b/data/debian-cd/trixie/amd64_businesscard_udeb_include
@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/trixie/amd64_netinst_udeb_include b/data/debian-cd/trixie/amd64_netinst_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/trixie/amd64_netinst_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/trixie/amd64_udeb_include b/data/debian-cd/trixie/amd64_udeb_include
new file mode 100644
index 000000000..155327762
--- /dev/null
+++ b/data/debian-cd/trixie/amd64_udeb_include
@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+pcmciautils-udeb
diff --git a/data/debian-cd/trixie/exclude-udebs b/data/debian-cd/trixie/exclude-udebs
new file mode 100644
index 000000000..390bfd48c
--- /dev/null
+++ b/data/debian-cd/trixie/exclude-udebs
@@ -0,0 +1,143 @@
+# These udebs build the d-i cdrom initrd. As such, there is no reason
+# to keep another copy of them on the CD in udeb form.
+# 
+# This duplicates data found in the file build/pkg-lists/kernel, in d-i svn
+kernel-image-*
+# build/pkg-lists/base in d-i svn
+archdetect
+rootskel
+main-menu
+cdebconf-udeb
+udpkg
+anna
+di-utils
+di-utils-shell
+di-utils-reboot
+lowmemcheck
+# build/pkg-lists/cdrom/common, in d-i svn (also included in the
+# root+cd-drivers floppies)
+busybox-udeb
+installation-locale
+localechooser
+iso-3166-udeb
+hw-detect
+cdrom-detect
+cdrom-retriever
+load-cdrom
+cdrom-checker
+bogl-bterm-udeb
+di-utils-terminfo
+cdebconf-priority
+cdebconf-newt-udeb
+usb-discover
+preseed-common
+initrd-preseed
+file-preseed
+nano-udeb
+floppy-retriever
+libfribidi0-udeb
+# Already on the initrd as dependencies
+libdebconfclient0-udeb
+libdebian-installer4-udeb
+libdebian-installer-extra4-udeb
+# These udebs are only useful in building the boot floppy image
+busybox-floppy-udeb
+rootskel-bootfloppy
+# Graphical installer: common udebs included in initrd
+rootskel-gtk
+cdebconf-gtk-udeb
+fontconfig-udeb
+gtk2-engines-udeb
+libatk1.0-udeb
+libexpat1-udeb
+libfreetype6-udeb
+libglib2.0-udeb
+libgtk2-engines-udeb
+libpango1.0-udeb
+libpcre3-udeb
+libpixman-1-0-udeb
+libpng*-udeb
+libsdl1.2debian-udeb
+mouse-modules-*
+ttf-*
+fbset-udeb
+# Graphical installer: udebs for directfb
+libdirectfb-*-udeb
+libcairo-directfb2-udeb
+libgtk-directfb-2.0-0-udeb
+# Graphical installer: udebs for X.Org
+xserver-xorg-core-udeb
+xserver-xorg-input-evdev-udeb
+xserver-xorg-video-fbdev-udeb
+x11-xkb-utils-udeb
+xkb-data-udeb
+libcairo2-udeb
+libdrm2-udeb
+libfontenc1-udeb
+libgtk-x11-udeb
+libpciaccess0-udeb
+libx11-6-udeb
+libxau6-udeb
+libxcb1-udeb
+libxcursor1-udeb
+libxdmcp6-udeb
+libxext6-udeb
+libxfixes3-udeb
+libxfont1-udeb
+libxft2-udeb
+libxi6-udeb
+libxinerama1-udeb
+libxkbfile1-udeb
+libxrender1-udeb
+# Graphical installer: terminal support is included in initrd
+cdebconf-gtk-terminal
+libvte9-udeb
+# Not currently used
+cdebootstrap-udeb
+hdparm-udeb
+dhcp-client-udeb
+# This package is only useful in the d-i-demo
+di-utils-exit-installer
+# No need for these loaders.
+download-installer
+load-floppy
+# Only useful in the hd-media initrd
+iso-scan
+load-iso
+# These are not really needed, the regular netcfg subsumes them
+netcfg-static
+# skolelinux stuff, not for the stock CDs
+debian-edu-install-udeb
+debian-edu-profile-udeb
+debian-edu-archive-keyring-udeb
+ltsp-client-builder
+autopartkit
+# live CD stuff
+live-installer
+simple-cdd-profiles
+# If needed, will be on the initrd already
+module-init-tools-udeb
+env-preseed
+rescue-check
+cdebconf-text-udeb
+brltty-udeb
+klibc-utils-udeb
+libklibc-udeb
+udev-udeb
+udev-gtk-udeb
+ai-choosers
+auto-install
+libslang2-udeb
+kbd-chooser
+kbd-udeb
+console-setup-*
+# Currently unused
+debian-ports-archive-keyring-udeb
+emdebian-archive-keyring-udeb
+nbd-client-udeb
+pwgen-udeb
+# Eh?
+gnumach-udeb
+# We only support grub these days, drop lilo and elilo
+lilo-installer
+elilo-installer
diff --git a/data/debian-cd/trixie/exclude-udebs-amd64 b/data/debian-cd/trixie/exclude-udebs-amd64
new file mode 100644
index 000000000..3b290ca5b
--- /dev/null
+++ b/data/debian-cd/trixie/exclude-udebs-amd64
@@ -0,0 +1,42 @@
+# These udebs are in the d-i cdrom initrd and the hd-media initrd. 
+# As such, there is no reason to keep another copy of them on the CD
+# in udeb form.
+console-keymaps-at
+console-keymaps-usb
+kbd-chooser
+acpi-modules-*
+ata-modules-*
+cdrom-core-modules-*
+core-modules-*
+fat-modules-*
+fb-modules-*
+ide-core-modules-*
+ide-modules-*
+input-modules-*
+isofs-modules-*
+mmc-modules-*
+nls-core-modules-*
+parport-modules-*
+pcmcia-modules-*
+sata-modules-*
+scsi-common-modules-*
+scsi-core-modules-*
+scsi-modules-*
+serial-modules-*
+speakup-modules-*
+usb-modules-*
+usb-serial-modules-*
+usb-storage-modules-*
+# Not used on amd64
+console-keymaps-acorn
+console-keymaps-amiga
+console-keymaps-atari
+console-keymaps-dec
+console-keymaps-sun
+# Not needed with the 2.6 kernel on amd64.
+userdevfs
+# Only needed on arches that use partconf or autopartkit.
+partconf-mkfstab
+# Not needed on arches that use partman
+mdcfg
+lvmcfg
diff --git a/data/debian-cd/trixie/udeb_exclude b/data/debian-cd/trixie/udeb_exclude
new file mode 100644
index 000000000..2e372f611
--- /dev/null
+++ b/data/debian-cd/trixie/udeb_exclude
@@ -0,0 +1 @@
+apt-mirror-setup
diff --git a/data/debian-cd/unstable b/data/debian-cd/unstable
index 20f08b4f4..9a63c961d 120000
--- a/data/debian-cd/unstable
+++ b/data/debian-cd/unstable
@@ -1 +1 @@
-squeeze
\ No newline at end of file
+sid
\ No newline at end of file