diff --git a/specs/2005.0/x86/livecd-stage1.spec b/specs/2005.0/x86/livecd-stage1.spec
new file mode 100644
index 00000000..b82f1149
--- /dev/null
+++ b/specs/2005.0/x86/livecd-stage1.spec
@@ -0,0 +1,64 @@
+subarch: x86
+version_stamp: 2005.0
+target: livecd-stage1
+rel_type: default
+profile: default-linux/x86/2005.0
+snapshot: 20050121
+source_subpath: default/stage3-x86-2005.0
+livecd/use:
+	-*
+	ipv6
+	socks5
+	livecd
+	fbcon
+	minimal
+	ncurses
+	readline
+	ssl
+	
+livecd/packages:
+	baselayout
+	livecd-tools
+	module-init-tools
+	dhcpcd
+	udev
+	gentoo-sources
+	kudzu-knoppix
+	hotplug
+	coldplug
+	fxload
+	irssi
+	gpm
+	syslog-ng
+	parted
+	links
+	raidtools
+	nfs-utils
+	jfsutils
+	usbutils
+	pciutils
+	xfsprogs
+	e2fsprogs
+	reiserfsprogs
+	cryptsetup
+	pwgen
+	popt
+	dialog
+	rp-pppoe
+	screen
+	mirrorselect
+	penggy
+	iputils
+	hwdata-knoppix
+	hwsetup
+	device-mapper
+	lvm2
+	evms
+	vim
+	pptpclient
+	mdadm
+	ethtool
+	wireless-tools
+	ntfsprogs
+	dosfstools
+	prism54-firmware
diff --git a/specs/2005.0/x86/livecd-stage2-minimal.spec b/specs/2005.0/x86/livecd-stage2-minimal.spec
new file mode 100644
index 00000000..90731fe7
--- /dev/null
+++ b/specs/2005.0/x86/livecd-stage2-minimal.spec
@@ -0,0 +1,297 @@
+subarch: x86
+version_stamp: 2005.0
+target: livecd-stage2
+rel_type: default
+profile: default-linux/x86/2005.0
+snapshot: 20050121
+#distcc_hosts: localhost/3 gravity/3 orion/3
+source_subpath: default/livecd-stage1-x86-2005.0
+
+livecd/cdfstype: squashfs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.11-memtest86+-cdtar.tar.bz2
+livecd/fsscript: /home/beejay/2005.0/fsscript.sh
+livecd/iso: /tmp/minimal-livecd.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2004.3
+livecd/gk_mainargs: 
+livecd/type: gentoo-release-minimal
+livecd/modblacklist:
+	8139cp
+
+#livecd/overlay: /root/livecd/overlay-minimal
+
+livecd/devmanager: udev
+
+livecd/rcadd:
+	syslog-ng:default
+	gpm:default
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-sources
+
+boot/kernel/gentoo/config: /home/beejay/2005.0/2.6.10-smp.config
+
+boot/kernel/gentoo/use: pcmcia usb -X
+
+boot/kernel/gentoo/postconf:
+	splashutils
+	splash-themes-livecd
+
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	speedtouch
+	slmodem
+	globespan-adsl
+	hostap-driver
+	hostap-utils
+	ipw2100
+	acpid
+	#fcdsl
+	#fritzcapi
+	#madwifi-driver
+
+livecd/unmerge:
+	acl
+	attr
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	distcc
+	addpatches
+	man
+	groff
+	lib-compat
+	miscfiles
+	rsync
+	sysklogd
+	bc
+	lcms
+	libmng
+	genkernel
+	diffutils
+#	file
+	libperl
+	gnuconfig
+	gcc-config
+	gcc
+	bin86
+	cpio
+	cronbase
+	ed
+	expat
+	grub
+	help2man
+	libtool
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/lock
+	/var/log
+	/var/run
+	/var/spool
+	/var/state
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/X11R6/lib/X11/doc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+# Added by wolf31o2
+	/etc/cron.daily
+	/etc/cron.hourly
+	/etc/cron.monthly
+	/etc/cron.weekly
+	/etc/logrotate.d
+	/etc/rsync
+	/usr/X11R6
+	/usr/include
+	/usr/lib/awk
+	/usr/lib/ccache
+	/usr/lib/gcc-config
+	/usr/lib/nfs
+	/usr/local
+	/usr/diet/include
+	/usr/diet/man
+	/usr/share/consolefonts/partialfonts
+	/usr/share/consoletrans
+	/usr/share/emacs
+	/usr/share/gcc-data
+	/usr/share/genkernel
+	/etc/bootsplash/gentoo
+	/etc/bootsplash/gentoo-highquality
+	/etc/splash/gentoo
+	/etc/splash/emergence
+	/usr/share/gnuconfig
+	/usr/share/lcms
+	/usr/share/locale/af
+	/usr/share/locale/be
+	/usr/share/locale/bg
+	/usr/share/locale/bs
+	/usr/share/locale/ca
+	/usr/share/locale/cs
+	/usr/share/locale/da
+	/usr/share/locale/de
+	/usr/share/locale/el
+	/usr/share/locale/en
+	/usr/share/locale/en_GB
+	/usr/share/locale/eo
+	/usr/share/locale/es
+	/usr/share/locale/et
+	/usr/share/locale/et_EE
+	/usr/share/locale/eu
+	/usr/share/locale/eu_ES
+	/usr/share/locale/fi
+	/usr/share/locale/fr
+	/usr/share/locale/ga
+	/usr/share/locale/gl
+	/usr/share/locale/gr
+	/usr/share/locale/he
+	/usr/share/locale/hr
+	/usr/share/locale/hu
+	/usr/share/locale/id
+	/usr/share/locale/is
+	/usr/share/locale/it
+	/usr/share/locale/ja
+	/usr/share/locale/ja_JP.EUC
+	/usr/share/locale/ko
+	/usr/share/locale/lug
+	/usr/share/locale/ms
+	/usr/share/locale/nb
+	/usr/share/locale/nl
+	/usr/share/locale/nn
+	/usr/share/locale/no
+	/usr/share/locale/pl
+	/usr/share/locale/pt
+	/usr/share/locale/pt_BR
+	/usr/share/locale/ro
+	/usr/share/locale/ru
+	/usr/share/locale/sk
+	/usr/share/locale/sl
+	/usr/share/locale/sr
+	/usr/share/locale/sv
+	/usr/share/locale/tr
+	/usr/share/locale/uk
+	/usr/share/locale/vi
+	/usr/share/locale/wa
+	/usr/share/locale/zh_CN
+	/usr/share/locale/zh_TW
+	#/usr/share/misc/file
+	#/usr/share/vim/vim63/doc
+	#/usr/share/vim/vim63/syntax
+	/etc/skel
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
+	/etc/dispatch-conf.conf
+	/etc/etc-update.conf
+	/etc/*-
+	/etc/issue*
+	/etc/make.conf
+	/etc/man.conf
+	/etc/*.old
+	/root/.viminfo
+	/usr/sbin/bootsplash*
+	/usr/sbin/fb*
+	/usr/sbin/fsck.cramfs
+	/usr/sbin/fsck.minix
+	/usr/sbin/mkfs.minix
+	/usr/sbin/mkfs.bfs
+	/usr/sbin/mkfs.cramfs
+	/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_motd.so
+	/lib/security/pam_mkhomedir.so
+	/lib/security/pam_postgresok.so
+	/lib/security/pam_rhosts_auth.so
+	/lib/security/pam_userdb.so
+	/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*
+	/etc/bootsplash/livecd-2004.3/images/bootsplash-12*
+	/etc/bootsplash/livecd-2004.3/images/bootsplash-16*
+	/etc/bootsplash/livecd-2004.3/images/bootsplash-8*
+	/etc/bootsplash/livecd-2004.3/images/silent-12*
+	/etc/bootsplash/livecd-2004.3/images/silent-16*
+	/etc/bootsplash/livecd-2004.3/images/silent-8*
+	/etc/splash/livecd-2004.3/16*
+	/etc/splash/livecd-2004.3/12*
+	/etc/splash/livecd-2004.3/6*
+	/etc/splash/livecd-2004.3/8*
+	/etc/splash/livecd-2004.3/images/silent-16*
+	/etc/splash/livecd-2004.3/images/silent-12*
+	/etc/splash/livecd-2004.3/images/silent-6*
+	/etc/splash/livecd-2004.3/images/silent-8*
+	/etc/splash/livecd-2004.3/images/verbose-16*
+	/etc/splash/livecd-2004.3/images/verbose-12*
+	/etc/splash/livecd-2004.3/images/verbose-6*
+	/etc/splash/livecd-2004.3/images/verbose-8*
+	/etc/make.conf.example
+	/etc/make.globals
+	/etc/resolv.conf
diff --git a/specs/2005.0/x86/livecd-stage2-universal.spec b/specs/2005.0/x86/livecd-stage2-universal.spec
new file mode 100644
index 00000000..2b3ecd6b
--- /dev/null
+++ b/specs/2005.0/x86/livecd-stage2-universal.spec
@@ -0,0 +1,284 @@
+subarch: x86
+version_stamp: 2004.3
+target: livecd-stage2
+rel_type: default
+profile: default-linux/x86/2004.3
+snapshot: 20041022
+distcc_hosts: localhost/3 gravity/3 orion/3
+source_subpath: default/livecd-stage1-x86-2004.3
+
+livecd/cdfstype: squashfs
+livecd/archscript: /usr/lib/catalyst/livecd/runscript/x86-archscript.sh
+livecd/runscript: /usr/lib/catalyst/livecd/runscript/default-runscript.sh
+livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.08-memtest86+-cdtar.tar.bz2
+livecd/fsscript: /home/beejay/2005.0/fsscript.sh
+livecd/iso: /tmp/universal-livecd.iso
+livecd/splash_type: gensplash
+livecd/splash_theme: livecd-2004.3
+
+livecd/type: gentoo-release-universal
+livecd/modblacklist:
+	8139cp
+
+livecd/overlay: /root/livecd/overlay-universal
+
+livecd/devmanager: udev
+
+livecd/rcadd:
+	syslog-ng:default
+	gpm:default
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-dev-sources
+
+boot/kernel/gentoo/config: /home/beejay/2005.0/2.6.10-smp.config
+
+boot/kernel/gentoo/use: pcmcia usb -X
+
+boot/kernel/gentoo/postconf:
+	splashutils
+	splash-themes-livecd
+
+boot/kernel/gentoo/packages:
+	pcmcia-cs
+	speedtouch
+	slmodem
+	globespan-adsl
+	hostap-driver
+	hostap-utils
+	ipw2100
+	# fcdsl
+	#fritzcapi
+#	madwifi-driver
+
+livecd/unmerge:
+	acl
+	attr
+	autoconf
+	automake
+	bin86
+	binutils
+	libtool
+	m4
+	bison
+	ld.so
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	texinfo
+	ccache
+	distcc
+	addpatches
+	man
+	groff
+	lib-compat
+	miscfiles
+	rsync
+	sysklogd
+	bc
+	lcms
+	libmng
+	genkernel
+	diffutils
+#	file
+	libperl
+	gnuconfig
+	gcc-config
+	gcc
+	bin86
+	cpio
+	cronbase
+	ed
+	expat
+	grub
+	help2man
+	libtool
+
+livecd/empty:
+	/var/tmp
+	/var/cache
+	/var/db
+	/var/empty
+	/var/lock
+	/var/log
+	/var/run
+	/var/spool
+	/var/state
+	/tmp
+	/usr/portage
+	/usr/share/man
+	/usr/share/info
+	/usr/share/unimaps
+	/usr/include
+	/usr/share/zoneinfo
+	/usr/share/dict
+	/usr/share/doc
+	/usr/share/ss
+	/usr/share/state
+	/usr/share/texinfo
+	/usr/lib/python2.2
+	/usr/lib/portage
+	/usr/share/gettext
+	/usr/share/i18n
+	/usr/share/rfc
+	/usr/X11R6/man
+	/usr/X11R6/include
+	/usr/X11R6/lib/X11/config
+	/usr/X11R6/lib/X11/etc
+	/usr/X11R6/lib/X11/doc
+	/usr/src
+	/usr/share/doc
+	/usr/share/man
+	/root/.ccache
+# Added by wolf31o2
+	/etc/cron.daily
+	/etc/cron.hourly
+	/etc/cron.monthly
+	/etc/cron.weekly
+	/etc/logrotate.d
+	/etc/rsync
+	/usr/X11R6
+	/usr/include
+	/usr/lib/awk
+	/usr/lib/ccache
+	/usr/lib/gcc-config
+	/usr/lib/nfs
+	/usr/local
+	/usr/diet/include
+	/usr/diet/man
+	/usr/share/consolefonts/partialfonts
+	/usr/share/consoletrans
+	/usr/share/emacs
+	/usr/share/gcc-data
+	/usr/share/genkernel
+	/etc/bootsplash/gentoo
+	/etc/bootsplash/gentoo-highquality
+	/etc/splash/gentoo
+	/etc/splash/emergence
+	/usr/share/gnuconfig
+	/usr/share/lcms
+	/usr/share/locale/af
+	/usr/share/locale/be
+	/usr/share/locale/bg
+	/usr/share/locale/bs
+	/usr/share/locale/ca
+	/usr/share/locale/cs
+	/usr/share/locale/da
+	/usr/share/locale/de
+	/usr/share/locale/el
+	/usr/share/locale/en
+	/usr/share/locale/en_GB
+	/usr/share/locale/eo
+	/usr/share/locale/es
+	/usr/share/locale/et
+	/usr/share/locale/et_EE
+	/usr/share/locale/eu
+	/usr/share/locale/eu_ES
+	/usr/share/locale/fi
+	/usr/share/locale/fr
+	/usr/share/locale/ga
+	/usr/share/locale/gl
+	/usr/share/locale/gr
+	/usr/share/locale/he
+	/usr/share/locale/hr
+	/usr/share/locale/hu
+	/usr/share/locale/id
+	/usr/share/locale/is
+	/usr/share/locale/it
+	/usr/share/locale/ja
+	/usr/share/locale/ja_JP.EUC
+	/usr/share/locale/ko
+	/usr/share/locale/lug
+	/usr/share/locale/ms
+	/usr/share/locale/nb
+	/usr/share/locale/nl
+	/usr/share/locale/nn
+	/usr/share/locale/no
+	/usr/share/locale/pl
+	/usr/share/locale/pt
+	/usr/share/locale/pt_BR
+	/usr/share/locale/ro
+	/usr/share/locale/ru
+	/usr/share/locale/sk
+	/usr/share/locale/sl
+	/usr/share/locale/sr
+	/usr/share/locale/sv
+	/usr/share/locale/tr
+	/usr/share/locale/uk
+	/usr/share/locale/vi
+	/usr/share/locale/wa
+	/usr/share/locale/zh_CN
+	/usr/share/locale/zh_TW
+	#/usr/share/misc/file
+	#/usr/share/vim/vim63/doc
+	#/usr/share/vim/vim63/syntax
+	/etc/skel
+
+livecd/rm:
+	/lib/*.a
+	/usr/lib/*.a
+	/usr/lib/gcc-lib/*/*/libgcj*
+	/usr/X11R6/lib/*.a
+	/etc/dispatch-conf.conf
+	/etc/etc-update.conf
+	/etc/*-
+	/etc/issue*
+	/etc/make.conf
+	/etc/man.conf
+	/etc/*.old
+	/root/.viminfo
+	/usr/sbin/bootsplash*
+	/usr/sbin/fb*
+	/usr/sbin/fsck.cramfs
+	/usr/sbin/fsck.minix
+	/usr/sbin/mkfs.minix
+	/usr/sbin/mkfs.bfs
+	/usr/sbin/mkfs.cramfs
+	/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_motd.so
+	/lib/security/pam_mkhomedir.so
+	/lib/security/pam_postgresok.so
+	/lib/security/pam_rhosts_auth.so
+	/lib/security/pam_userdb.so
+	/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*
+	/etc/bootsplash/livecd-2004.2/images/bootsplash-12*
+	/etc/bootsplash/livecd-2004.2/images/bootsplash-16*
+	/etc/bootsplash/livecd-2004.2/images/bootsplash-8*
+	/etc/bootsplash/livecd-2004.2/images/silent-12*
+	/etc/bootsplash/livecd-2004.2/images/silent-16*
+	/etc/bootsplash/livecd-2004.2/images/silent-8*
+	/etc/make.conf.example
+	/etc/make.globals
+	/etc/resolv.conf
diff --git a/specs/2005.0/x86/packagecd.spec b/specs/2005.0/x86/packagecd.spec
new file mode 100644
index 00000000..3d4fddb5
--- /dev/null
+++ b/specs/2005.0/x86/packagecd.spec
@@ -0,0 +1,132 @@
+subarch: x86
+version_stamp: 2005.0
+target: grp
+rel_type: default
+profile: default-linux/x86/2005.0
+snapshot: 20050121
+source_subpath: default/stage3-x86-2005.0
+grp: src cd2
+
+grp/use: 
+	gtk2 
+	gnome 
+	kde 
+	qt 
+	bonobo 
+	cdr 
+	esd 
+	gtkhtml 
+	mozilla
+	mysql
+	perl
+	ruby
+	tcltk
+	cups
+	ldap
+	ssl
+	tcpd
+	-svga
+
+grp/src/type: srcset
+grp/src/packages:
+	ucl
+	udev
+	gentoo-sources
+#	gentoo-dev-sources
+	vanilla-sources
+#	development-sources
+	rp-pppoe
+	speedtouch
+	fcpci
+	globespan-adsl
+	pptpclient
+	slmodem
+	lvm2
+	iputils
+	vixie-cron
+	fcron
+	dcron
+	sysklogd
+	metalog
+	syslog-ng
+	raidtools
+	jfsutils
+	xfsprogs
+	reiserfsprogs
+	lvm2
+	dosfstools
+	lilo
+	grub
+	gentoolkit
+	chkrootkit
+	isdn4k-utils
+	iproute2
+	nvidia-kernel
+	nvidia-glx
+	ati-drivers
+	wireless-tools
+	pcmcia-cs
+        slocate
+	dhcpcd
+	pciutils
+	usbutils
+	genkernel
+	fcdsl
+	fritzcapi
+				
+grp/cd2/type: pkgset
+grp/cd2/packages:
+	hotplug
+	coldplug
+	dante
+	tsocks
+	sys-apps/eject
+	xorg-x11
+	=x11-base/xorg-x11-6.7.0-r3
+	minicom
+	links
+	lynx
+	acpid
+	parted
+	whois
+	tcpdump
+	cvs
+	unzip
+	zip
+	netcat
+	partimage
+	DirectFB
+	apache
+	app-cdr/cdrtools
+	gnome
+	evolution
+	cups
+	dev-db/mysql
+	dev-lang/ruby
+	emacs
+	enlightenment
+	fluxbox
+	kde
+	libsdl
+	mozilla
+	xfce4
+	openbox
+	fluxbox
+	openoffice-bin
+	sylpheed
+	vim
+	xemacs
+	xmms
+	mozilla-firefox
+	mozilla-thunderbird
+	abiword
+	gaim
+	xchat
+	tetex
+	xcdroast
+	k3b
+	samba
+	nmap
+	gradm
+	ettercap
+	logrotate
diff --git a/specs/2005.0/x86/snapshot.spec b/specs/2005.0/x86/snapshot.spec
new file mode 100644
index 00000000..8ab240c0
--- /dev/null
+++ b/specs/2005.0/x86/snapshot.spec
@@ -0,0 +1,2 @@
+target: snapshot
+version_stamp: 20041022