diff --git a/specs/2006.1/amd64/livecd-stage1-gnome.spec b/specs/2006.1/amd64/livecd-stage1-gnome.spec
new file mode 100644
index 00000000..d7437b5c
--- /dev/null
+++ b/specs/2006.1/amd64/livecd-stage1-gnome.spec
@@ -0,0 +1,144 @@
+subarch: amd64
+version_stamp: installer-2006.1
+target: livecd-stage1
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/stage3-amd64-2006.1
+livecd/use:
+	atm
+	branding
+	livecd
+	socks5
+
+livecd/packages:
+	app-admin/ide-smart
+	app-admin/logrotate
+	app-admin/passook
+	app-admin/pwgen
+	app-admin/sudo
+	app-admin/syslog-ng
+	app-arch/mt-st
+	app-arch/unrar
+	app-arch/unzip
+	app-benchmarks/cpuburn
+	app-cdr/cdrtools
+#	app-cdr/k3b
+	app-crypt/gnupg
+	app-editors/emacs
+	app-editors/vim
+#	app-editors/xemacs
+	app-misc/livecd-tools
+	app-misc/screen
+	app-misc/vlock
+#	app-office/koffice
+#	app-office/openoffice
+	app-office/openoffice-bin
+	app-portage/gentoolkit
+	app-portage/mirrorselect
+	app-portage/ufed
+#	app-text/tetex
+	dev-util/ccache
+	gnome-base/gnome
+#	kde-base/kde-meta
+	mail-client/evolution
+	mail-client/mozilla-thunderbird
+#	mail-client/sylpheed
+#	media-gfx/gimp
+	media-gfx/fbgrab
+	media-sound/audacious
+	media-sound/rhythmbox
+	media-video/mplayer
+	net-analyzer/ettercap
+	net-analyzer/netcat
+	net-analyzer/nmap
+	net-analyzer/tcpdump
+	net-analyzer/tcptraceroute
+	net-analyzer/traceroute
+	net-analyzer/wireshark
+	net-dialup/bpalogin
+	net-dialup/mingetty
+	net-dialup/minicom
+#	net-dialup/penggy
+	net-dialup/pptpclient
+	net-dialup/rp-pppoe
+	net-fs/nfs-utils
+#	net-fs/samba
+	net-im/gaim
+	net-irc/irssi
+	net-irc/xchat
+	net-misc/bridge-utils
+	net-misc/dhcpcd
+	net-misc/iputils
+	net-misc/rdate
+	net-misc/vconfig
+	net-misc/vpnc
+	net-misc/whois
+	net-nntp/pan
+	net-p2p/bittorrent
+	net-proxy/dante
+	net-proxy/tsocks
+	net-wireless/airsnort
+	net-wireless/ipw2100-firmware
+	net-wireless/ipw2200-firmware
+	net-wireless/prism54-firmware
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	net-wireless/zd1201-firmware
+	sys-apps/apmd
+	sys-apps/coldplug
+	sys-apps/eject
+	sys-apps/ethtool
+	sys-apps/fxload
+	sys-apps/gli
+	sys-apps/gradm
+	sys-apps/hdparm
+	sys-apps/hwsetup
+	sys-apps/iproute2
+	sys-apps/memtester
+	sys-apps/parted
+#	sys-apps/powerpc-utils
+#	sys-apps/ibm-powerpc-utils
+#	sys-apps/ibm-powerpc-utils-papr
+	sys-apps/slocate
+	sys-apps/smartmontools
+	sys-block/gpart
+	sys-block/partimage
+	sys-boot/grub
+	sys-boot/lilo
+	sys-boot/syslinux
+#	sys-boot/yaboot
+#	sys-devel/binutils-hppa64
+	sys-devel/distcc
+#	sys-devel/gcc-hppa64
+#	sys-fs/dmraid
+	sys-fs/dosfstools
+	sys-fs/e2fsprogs
+	sys-fs/evms
+#	sys-fs/hfsplusutils
+#	sys-fs/hfsutils
+#	sys-fs/iprutils
+	sys-fs/jfsutils
+	sys-fs/lsscsi
+	sys-fs/lvm2
+#	sys-fs/lvm-user
+#	sys-fs/mac-fdisk
+	sys-fs/mdadm
+#	sys-fs/multipath-tools
+	sys-fs/ntfsprogs
+	sys-fs/raidtools
+	sys-fs/reiserfsprogs
+	sys-fs/xfsprogs
+	sys-kernel/genkernel
+	sys-libs/gpm
+	sys-power/acpid
+#	sys-power/apmd
+	sys-process/vixie-cron
+	www-client/links
+	www-client/mozilla-firefox
+	x11-base/xorg-x11
+	x11-drivers/synaptics
+	x11-misc/xscreensaver
+#	x11-wm/enlightenment
+#	x11-wm/fluxbox
+#	xfce-base/xfce4
diff --git a/specs/2006.1/amd64/livecd-stage1-minimal.spec b/specs/2006.1/amd64/livecd-stage1-minimal.spec
new file mode 100644
index 00000000..94d2fb5e
--- /dev/null
+++ b/specs/2006.1/amd64/livecd-stage1-minimal.spec
@@ -0,0 +1,94 @@
+subarch: amd64
+version_stamp: 2006.1
+target: livecd-stage1
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/stage3-amd64-2006.1
+livecd/use:
+	-*
+	atm
+	fbcon
+	ipv6
+	livecd
+	ncurses
+	nls
+	nptl
+	nptlonly
+	pam
+	readline
+	socks5
+	ssl
+	unicode
+	userlocales
+
+livecd/packages:
+	app-admin/passook
+	app-admin/pwgen
+	app-admin/syslog-ng
+	app-arch/unzip
+	app-editors/vim
+	app-misc/livecd-tools
+	app-misc/screen
+	app-misc/vlock
+	app-portage/mirrorselect
+	dev-lang/python
+	media-gfx/fbgrab
+	net-analyzer/tcptraceroute
+	net-analyzer/traceroute
+#	net-dialup/bpalogin
+	net-dialup/mingetty
+#	net-dialup/penggy
+	net-dialup/pptpclient
+	net-dialup/rp-pppoe
+	net-fs/nfs-utils
+	net-irc/irssi
+	net-misc/dhcpcd
+	net-misc/iputils
+	net-misc/rdate
+	net-misc/vconfig
+#	net-wireless/ipw2100-firmware
+#	net-wireless/ipw2200-firmware
+	net-wireless/prism54-firmware
+	net-wireless/wireless-tools
+#	net-wireless/wpa_supplicant
+#	net-wireless/zd1201-firmware
+	sys-apps/apmd
+	sys-apps/coldplug
+	sys-apps/eject
+	sys-apps/ethtool
+	sys-apps/fxload
+	sys-apps/hdparm
+	sys-apps/hwsetup
+	sys-apps/iproute2
+	sys-apps/memtester
+	sys-apps/parted
+#	sys-apps/powerpc-utils
+#	sys-apps/ibm-powerpc-utils
+#	sys-apps/ibm-powerpc-utils-papr
+#	sys-block/partimage
+#	sys-boot/yaboot
+#	sys-devel/binutils-hppa64
+#	sys-devel/gcc-hppa64
+#	sys-fs/dmraid
+	sys-fs/dosfstools
+	sys-fs/e2fsprogs
+	sys-fs/evms
+#	sys-fs/hfsplusutils
+#	sys-fs/hfsutils
+#	sys-fs/iprutils
+	sys-fs/jfsutils
+	sys-fs/lsscsi
+	sys-fs/lvm2
+#	sys-fs/lvm-user
+#	sys-fs/mac-fdisk
+	sys-fs/mdadm
+#	sys-fs/multipath-tools
+	sys-fs/ntfsprogs
+	sys-fs/raidtools
+	sys-fs/reiserfsprogs
+	sys-fs/xfsprogs
+	sys-libs/gpm
+	sys-power/acpid
+#	sys-power/apmd
+	www-client/links
diff --git a/specs/2006.1/amd64/livecd-stage2-gnome.spec b/specs/2006.1/amd64/livecd-stage2-gnome.spec
new file mode 100644
index 00000000..d681ab01
--- /dev/null
+++ b/specs/2006.1/amd64/livecd-stage2-gnome.spec
@@ -0,0 +1,79 @@
+subarch: amd64
+version_stamp: 2006.1
+target: livecd-stage2
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/livecd-stage1-amd64-installer-2006.1
+
+livecd/fstype: squashfs
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
+
+livecd/iso: /var/tmp/catalyst2/builds/default/livecd-amd64-installer-2006.1.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2006.1
+livecd/xdm: gdm
+livecd/xsession: gnome
+
+livecd/type: gentoo-release-livecd
+livecd/users: gentoo
+livecd/volid: Gentoo Linux 2006.1 amd64 LiveCD
+
+livecd/overlay: /root/livecd/overlays/livecd/2006.1
+livecd/root_overlay: /root/livecd/overlays/root-livecd
+
+livecd/bootargs: dokeymap
+livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2
+#--unionfs-dev
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+
+boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2006.1/amd64/livecd-2.6.17.config
+
+boot/kernel/gentoo/use: pcmcia usb oss atm
+
+boot/kernel/gentoo/packages:
+	media-gfx/splashutils
+	media-gfx/splash-themes-livecd
+	sys-apps/pcmciautils
+	sys-apps/acpid
+	sys-fs/cryptsetup
+#	net-wireless/at76c503a
+#	net-wireless/rt2500
+#	net-wireless/rtl8180
+#	net-wireless/adm8211
+#	net-wireless/acx
+	net-wireless/rt2500
+	net-wireless/ipw3945
+# These three are removed for licensing reasons.
+#	media-video/nvidia-kernel
+#	media-video/nvidia-glx
+#	x11-drivers/ati-drivers
+	media-libs/alsa-lib
+	media-libs/alsa-oss
+	media-sound/alsa-utils
+
+livecd/unmerge:
+	sys-kernel/gentoo-sources
+
+livecd/empty:
+	/var/tmp
+	/var/empty
+	/var/run
+	/var/state
+	/var/cache/edb/dep
+	/tmp
+	/usr/portage
+	/usr/src
+	/root/.ccache
+	/etc/splash/gentoo
+	/etc/splash/emergence
+	/usr/share/genkernel/pkg/x86/cpio
+
+livecd/rm:
+	/etc/*-
+	/etc/*.old
+	/root/.viminfo
+	/var/log/*.log
+	/usr/share/genkernel/pkg/x86/*.bz2
diff --git a/specs/2006.1/amd64/livecd-stage2-minimal.spec b/specs/2006.1/amd64/livecd-stage2-minimal.spec
new file mode 100644
index 00000000..0cd58063
--- /dev/null
+++ b/specs/2006.1/amd64/livecd-stage2-minimal.spec
@@ -0,0 +1,341 @@
+subarch: amd64
+version_stamp: 2006.1
+target: livecd-stage2
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/livecd-stage1-amd64-2006.1
+
+livecd/fstype: squashfs
+livecd/cdtar: /usr/lib/catalyst2/livecd/cdtar/isolinux-3.09-memtest86+-cdtar.tar.bz2
+
+livecd/iso: /var/tmp/catalyst2/builds/default/install-amd64-minimal-2006.1.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2006.1
+
+livecd/volid: Gentoo Linux amd64 2006.1
+livecd/type: gentoo-release-minimal
+
+#livecd/overlay: /root/livecd/overlays/amd64-minimal
+
+livecd/bootargs: dokeymap
+livecd/gk_mainargs: --makeopts=-j16 --lvm2 --dmraid --evms2
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+
+boot/kernel/gentoo/config: /root/livecd/kconfig/releases/2006.1/amd64/installcd-2.6.17.config
+
+boot/kernel/gentoo/use: pcmcia usb -X png truetype -qt
+
+boot/kernel/gentoo/packages:
+	media-gfx/splashutils
+	media-gfx/splash-themes-livecd
+	sys-apps/pcmciautils
+	sys-fs/cryptsetup-luks
+# These were not stable at time of snapshot/release.
+#	net-wireless/at76c503a
+#	net-wireless/rtl8180
+#	net-wireless/rtl8187
+#	net-wireless/adm8211
+#	net-wireless/acx
+	net-wireless/rt2500
+
+livecd/unmerge:
+#	acl
+#	addpatches
+#	attr
+	alsa-headers
+	autoconf
+	autoconf-wrapper
+	automake
+	automake-wrapper
+#	bc
+#	bin86
+	binutils
+	binutils-config
+	bison
+	busybox
+#	ccache
+	cpio
+#	cronbase
+#	devfsd
+	diffutils
+#	distcc
+#	ed
+	expat
+	flex
+	gcc
+	gcc-config
+#	gcc-sparc64
+	genkernel
+	gentoo-sources
+	gettext
+	gnuconfig
+	groff
+#	grub
+	help2man
+#	lcms
+#	ld.so
+#	lib-compat
+#	libmng
+	libperl
+	libtool
+	linux-headers
+	m4
+	make
+	man
+	man-pages
+	miscfiles
+	pax-utils
+	patch
+	perl
+	perl-cleaner
+	perl-Test-Simple
+	PodParser
+	pycrypto
+	rsync
+	sandbox
+#	sash
+#	sysklogd
+#	tcp-wrappers
+	Test-Harness
+	texinfo
+#	ucl
+#	vanilla-sources
+
+livecd/empty:
+	/etc/bootsplash/gentoo
+	/etc/bootsplash/gentoo-highquality
+	/etc/cron.daily
+	/etc/cron.hourly
+	/etc/cron.monthly
+	/etc/cron.weekly
+	/etc/logrotate.d
+	/etc/modules.autoload.d
+	/etc/rsync
+	/etc/runlevels/single
+	/etc/skel
+	/etc/splash/emergence
+	/etc/splash/gentoo
+	/lib/dev-state
+	/lib/udev-state
+	/lib64/dev-state
+	/lib64/udev-state
+	/root/.ccache
+	/tmp
+	/usr/diet/include
+	/usr/diet/man
+	/usr/i386-gentoo-linux-uclibc
+	/usr/i386-pc-linux-gnu
+	/usr/i386-pc-linux-uclibc
+	/usr/include
+	/usr/lib/X11/config
+	/usr/lib/X11/doc
+	/usr/lib/X11/etc
+	/usr/lib/awk
+	/usr/lib/ccache
+	/usr/lib/gcc-config
+	/usr/lib/gconv
+	/usr/lib/nfs
+	/usr/lib/perl5
+	/usr/lib/portage
+	/usr/lib/python2.2
+	/usr/lib/python2.3
+	/usr/lib/python2.4/tests
+	/usr/lib64/X11/config
+	/usr/lib64/X11/doc
+	/usr/lib64/X11/etc
+	/usr/lib64/awk
+	/usr/lib64/ccache
+	/usr/lib64/gcc-config
+	/usr/lib64/gconv
+	/usr/lib64/nfs
+	/usr/lib64/perl5
+	/usr/lib64/portage
+	/usr/lib64/python2.2
+	/usr/lib64/python2.3
+	/usr/lib64/python2.4/tests
+	/usr/local
+	/usr/portage
+	/usr/powerpc-unknown-linux-gnu
+	/usr/powerpc64-unknown-linux-gnu
+	/usr/share/aclocal
+	/usr/share/baselayout
+	/usr/share/binutils-data
+	/usr/share/consolefonts/partialfonts
+	/usr/share/consoletrans
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/emacs
+	/usr/share/et
+	/usr/share/gcc-data
+	/usr/share/genkernel
+	/usr/share/gettext
+	/usr/share/glib-2.0
+	/usr/share/gnuconfig
+	/usr/share/gtk-doc
+	/usr/share/i18n
+	/usr/share/info
+	/usr/share/lcms
+	/usr/share/libtool
+	/usr/share/locale
+	/usr/share/man
+	/usr/share/perl
+	/usr/share/rfc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/share/unimaps
+	/usr/share/zoneinfo
+	/usr/sparc-unknown-linux-gnu
+	/usr/src
+	/usr/x86_64-pc-linux-gnu
+	/var/cache
+	/var/db
+	/var/empty
+	/var/lib/portage
+	/var/lock
+	/var/log
+	/var/run
+	/var/spool
+	/var/state
+	/var/tmp
+
+livecd/rm:
+	/boot/System*
+	/boot/initr*
+	/boot/kernel*
+	/etc/*-
+	/etc/*.old
+	/etc/default/audioctl
+	/etc/dispatch-conf.conf
+	/etc/env.d/05binutils
+	/etc/env.d/05gcc
+	/etc/etc-update.conf
+	/etc/hosts.bck
+	/etc/issue*
+	/etc/genkernel.conf
+	/etc/make.conf
+	/etc/make.conf.example
+	/etc/make.globals
+	/etc/make.profile
+	/etc/man.conf
+	/etc/resolv.conf
+	/etc/splash/livecd-2006.1/12*
+	/etc/splash/livecd-2006.1/14*
+	/etc/splash/livecd-2006.1/16*
+	/etc/splash/livecd-2006.1/19*
+	/etc/splash/livecd-2006.1/6*
+	/etc/splash/livecd-2006.1/8*
+	/etc/splash/livecd-2006.1/images/background-12*
+	/etc/splash/livecd-2006.1/images/background-14*
+	/etc/splash/livecd-2006.1/images/background-16*
+	/etc/splash/livecd-2006.1/images/background-19*
+	/etc/splash/livecd-2006.1/images/background-6*
+	/etc/splash/livecd-2006.1/images/background-8*
+	/etc/splash/livecd-2006.1/images/verbose-12*
+	/etc/splash/livecd-2006.1/images/verbose-14*
+	/etc/splash/livecd-2006.1/images/verbose-16*
+	/etc/splash/livecd-2006.1/images/verbose-19*
+	/etc/splash/livecd-2006.1/images/verbose-6*
+	/etc/splash/livecd-2006.1/images/verbose-8*
+	/lib*/*.a
+	/lib*/*.la
+	/lib*/cpp
+	/lib*/security/pam_access.so
+	/lib*/security/pam_chroot.so
+	/lib*/security/pam_debug.so
+	/lib*/security/pam_ftp.so
+	/lib*/security/pam_issue.so
+	/lib*/security/pam_mail.so
+	/lib*/security/pam_mkhomedir.so
+	/lib*/security/pam_motd.so
+	/lib*/security/pam_postgresok.so
+	/lib*/security/pam_rhosts_auth.so
+	/lib*/security/pam_userdb.so
+	/root/.bash_history
+	/root/.viminfo
+	/sbin/fsck.cramfs
+	/sbin/fsck.minix
+	/sbin/mkfs.bfs
+	/sbin/mkfs.cramfs
+	/sbin/mkfs.minix
+	/usr/bin/addr2line
+	/usr/bin/ar
+	/usr/bin/as
+	/usr/bin/audioctl
+	/usr/bin/c++*
+	/usr/bin/cc
+	/usr/bin/cjpeg
+	/usr/bin/cpp
+	/usr/bin/djpeg
+	/usr/bin/ebuild
+	/usr/bin/emerge
+	/usr/bin/elftoaout
+	/usr/bin/f77
+	/usr/bin/g++*
+	/usr/bin/g77
+	/usr/bin/gcc*
+	/usr/bin/genkernel
+	/usr/bin/gprof
+	/usr/bin/i386-gentoo-linux-uclibc-*
+	/usr/bin/i386-pc-linux-*
+	/usr/bin/jpegtran
+	/usr/bin/ld
+	/usr/bin/libpng*
+	/usr/bin/nm
+	/usr/bin/objcopy
+	/usr/bin/objdump
+	/usr/bin/piggyback*
+	/usr/bin/portageq
+	/usr/bin/ranlib
+	/usr/bin/readelf
+	/usr/bin/repoman
+	/usr/bin/size
+	/usr/bin/powerpc-unknown-linux-gnu-*
+	/usr/bin/powerpc64-unknown-linux-gnu-*
+	/usr/bin/sparc-unknown-linux-gnu-*
+	/usr/bin/sparc64-unknown-linux-gnu-*
+	/usr/bin/strings
+	/usr/bin/strip
+	/usr/bin/tbz2tool
+	/usr/bin/x86_64-pc-linux-gnu-*
+	/usr/bin/xpak
+	/usr/bin/yacc
+	/usr/lib*/*.a
+	/usr/lib*/*.la
+	/usr/lib*/gcc-lib/*/*/libgcj*
+	/usr/sbin/archive-conf
+	/usr/sbin/bootsplash*
+	/usr/sbin/dispatch-conf
+	/usr/sbin/emaint
+	/usr/sbin/emerge-webrsync
+	/usr/sbin/env-update
+	/usr/sbin/fb*
+	/usr/sbin/fixpackages
+	/usr/sbin/quickpkg
+	/usr/sbin/regenworld
+	/usr/share/consolefonts/1*
+	/usr/share/consolefonts/7*
+	/usr/share/consolefonts/8*
+	/usr/share/consolefonts/9*
+	/usr/share/consolefonts/A*
+	/usr/share/consolefonts/C*
+	/usr/share/consolefonts/E*
+	/usr/share/consolefonts/G*
+	/usr/share/consolefonts/L*
+	/usr/share/consolefonts/M*
+	/usr/share/consolefonts/R*
+	/usr/share/consolefonts/a*
+	/usr/share/consolefonts/c*
+	/usr/share/consolefonts/dr*
+	/usr/share/consolefonts/g*
+	/usr/share/consolefonts/i*
+	/usr/share/consolefonts/k*
+	/usr/share/consolefonts/l*
+	/usr/share/consolefonts/r*
+	/usr/share/consolefonts/s*
+	/usr/share/consolefonts/t*
+	/usr/share/consolefonts/v*
+	/usr/share/misc/*.old
diff --git a/specs/2006.1/amd64/stage1.spec b/specs/2006.1/amd64/stage1.spec
new file mode 100644
index 00000000..fdda3aa6
--- /dev/null
+++ b/specs/2006.1/amd64/stage1.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+target: stage1
+version_stamp: 2006.1
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/stage3-amd64-2006.0
diff --git a/specs/2006.1/amd64/stage2.spec b/specs/2006.1/amd64/stage2.spec
new file mode 100644
index 00000000..fc13a079
--- /dev/null
+++ b/specs/2006.1/amd64/stage2.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+target: stage2
+version_stamp: 2006.1
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/stage1-amd64-2006.1
diff --git a/specs/2006.1/amd64/stage3.spec b/specs/2006.1/amd64/stage3.spec
new file mode 100644
index 00000000..236d6571
--- /dev/null
+++ b/specs/2006.1/amd64/stage3.spec
@@ -0,0 +1,7 @@
+subarch: amd64
+target: stage3
+version_stamp: 2006.1
+rel_type: default
+profile: default-linux/amd64/2006.1
+snapshot: 2006.1
+source_subpath: default/stage2-amd64-2006.1