diff --git a/specs/2004.3/amd64/livecd-stage1.spec b/specs/2004.3/amd64/livecd-stage1.spec
index def8dceb..4bf2f38c 100644
--- a/specs/2004.3/amd64/livecd-stage1.spec
+++ b/specs/2004.3/amd64/livecd-stage1.spec
@@ -1,74 +1,59 @@
 subarch: amd64
-version_stamp: 20041011
+version_stamp: 2004.3
 target: livecd-stage1
 rel_type: default
 profile: default-linux/amd64/2004.3
 snapshot: 20041011
 source_subpath: default/stage3-amd64-20041011
 livecd/use:
-	-X
-	-gtk
-	-svga
+	-*
 	ipv6
 	socks5
 	livecd
 	fbcon
+	minimal
+	ncurses
+	readline
 	ssl
 	
 livecd/packages:
 	baselayout
 	livecd-tools
-	genkernel
-#	bootsplash-themes-livecd
-	ucl
-	kudzu-knoppix
+	mingetty
 	module-init-tools
+	dhcpcd
+	gentoo-dev-sources
+	kudzu-knoppix
 	hotplug
-	irssi
-	aumix
-	metalog
-	pciutils
+	fxload
+	syslog-ng
 	parted
-	mt-st
 	links
-	star
-	strace
 	raidtools
 	nfs-utils
 	jfsutils
 	usbutils
-	speedtouch
 	xfsprogs
 	e2fsprogs
 	reiserfsprogs
-	hdparm
-	nano
-	less
-	openssh
-	dhcpcd
-	mingetty
+#	cryptsetup
 	pwgen
 	popt
 	dialog
 	rp-pppoe
-	gpm
 	screen
 	mirrorselect
 #	penggy
 	iputils
+	acpid
 	hwdata-knoppix
 	hwsetup
-	bootsplash
 	device-mapper
 	lvm2
-	evms
 	vim
-#	gpart
-	pwgen
 	pptpclient
 	mdadm
-#	tcptraceroute
-	netcat
 	ethtool
 	wireless-tools
-	ufed
+#	madwifi-tools
+#	ntlmaps
diff --git a/specs/2004.3/amd64/livecd-stage2.spec b/specs/2004.3/amd64/livecd-stage2.spec
index c51bab44..43b88a8e 100644
--- a/specs/2004.3/amd64/livecd-stage2.spec
+++ b/specs/2004.3/amd64/livecd-stage2.spec
@@ -1,52 +1,42 @@
 subarch: amd64
-version_stamp: 20041011
+version_stamp: 2004.3
 target: livecd-stage2
 rel_type: default
 profile: default-linux/amd64/2004.3
 snapshot: 20041011
-source_subpath: default/livecd-stage1-amd64-20041011
+source_subpath: default/livecd-stage1-amd64-2004.3
 
-livecd/cdfstype: squashfs
+livecd/cdfstype: zisofs
 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/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-20041011-r1.iso
-# livecd/bootsplash: livecd-2004.3
+livecd/iso: /var/tmp/catalyst/builds/default/install-amd64-minimal-20041013.iso
+
 livecd/type: gentoo-release-minimal
-livecd/modblacklist: siimage 8139cp
+livecd/modblacklist:
+	8139cp
 
-boot/kernel: smp
+livecd/rcadd:
+	syslog-ng:default
+
+boot/kernel: gentoo
+boot/kernel/gentoo/sources: gentoo-dev-sources
+
+boot/kernel/gentoo/config: kconfig/kernel-2.6.8-amd64-smp
+
+boot/kernel/gentoo/use: pcmcia usb
 
-# gentoo livecd kernel
-boot/kernel/gentoo/sources: sys-kernel/gentoo-dev-sources
-boot/kernel/gentoo/config: kconfig/kernel-config-2.6
-boot/kernel/gentoo/use: pcmcia usb -X
-boot/kernel/gentoo/extraversion: up
 boot/kernel/gentoo/packages:
 	pcmcia-cs
-	iptables
-	xfsdump
-
-# smp livecd kernel
-boot/kernel/smp/sources: sys-kernel/gentoo-dev-sources
-boot/kernel/smp/config: kconfig/kernel-config-2.6-smp
-boot/kernel/smp/use: pcmcia usb -X
-boot/kernel/smp/extraversion: smp
-boot/kernel/smp/packages:
-	pcmcia-cs
-	iptables
-
-# emachines livecd kernel
-# boot/kernel/emachines/sources: =sys-kernel/gentoo-dev-sources-2.6.3-r1
-# boot/kernel/emachines/config: /root/livecd/kconfig/20040710-gentoo-dev-sources-2.6.3-emachines-amd64.config
-# boot/kernel/emachines/kernelopts: pci=noacpi noapic
-# boot/kernel/emachines/use: pcmcia usb -X
-# boot/kernel/emachines/extraversion: emachines
-# boot/kernel/emachines/packages:
-#	pcmcia-cs
-#	iptables
+	speedtouch
+	hostap-driver
+	hostap-utils
+	ipw2100
+#	madwifi-driver
 
 livecd/unmerge:
+	acl
+	attr
 	autoconf
 	automake
 	bin86
@@ -66,21 +56,45 @@ livecd/unmerge:
 	gettext
 	texinfo
 	ccache
+	distcc
 	addpatches
 	man
 	groff
 	lib-compat
-	gcc
 	miscfiles
+	rsync
+	sysklogd
+	bc
+	lcms
+	libmng
+	libpng
+	genkernel
+	diffutils
+	file
+	libperl
+	gnuconfig
+	gcc-config
+	gcc
+	bin86
+	cpio
+	cronbase
+	ed
+	expat
+	grub
+	help2man
+	libtool
+	which
 
 livecd/empty:
 	/var/tmp
 	/var/cache
 	/var/db
 	/var/empty
-	/var/cache
 	/var/lock
 	/var/log
+	/var/run
+	/var/spool
+	/var/state
 	/tmp
 	/usr/portage
 	/usr/share/man
@@ -102,13 +116,154 @@ livecd/empty:
 	/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/bootsplash/livecd-2004.2/images/bootplash*
+	/etc/make.conf.example
+	/etc/make.globals
diff --git a/specs/2004.3/amd64/packagecd.spec b/specs/2004.3/amd64/packagecd.spec
new file mode 100644
index 00000000..c333d930
--- /dev/null
+++ b/specs/2004.3/amd64/packagecd.spec
@@ -0,0 +1,126 @@
+subarch: x86
+version_stamp: 2004.2
+target: grp
+rel_type: default
+profile: default-linux/x86/2004.3
+snapshot: 20041009
+distcc_hosts: localhost/3 gravity/3 orion/3
+source_subpath: default/stage3-x86-2004.2
+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
+	fcdsl
+	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
+	madwifi
+	pcmcia-cs
+	genkernel
+	
+grp/cd2/type: pkgset
+grp/cd2/packages:
+	pciutils
+	hotplug
+	dante
+	tsocks
+	sys-apps/eject
+	xorg-x11
+	minicom
+	links
+	lynx
+	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/2004.3/amd64/stage1.spec b/specs/2004.3/amd64/stage1.spec
index 1f6a5d73..10bd6d81 100644
--- a/specs/2004.3/amd64/stage1.spec
+++ b/specs/2004.3/amd64/stage1.spec
@@ -1,10 +1,10 @@
-# $Id: stage1.spec,v 1.5 2004-10-12 19:56:22 jhuebel Exp $
+# $Id: stage1.spec,v 1.6 2004-10-25 01:13:31 jhuebel Exp $
 
 subarch: amd64
-version_stamp: 20041011
+version_stamp: 20041022
 target: stage1
 rel_type: default
 rel_verson: 2004.3
 profile: default-linux/amd64/2004.3
-snapshot: 20041011
+snapshot: 20041022
 source_subpath: default/stage2-amd64-20040928
diff --git a/specs/2004.3/amd64/stage2.spec b/specs/2004.3/amd64/stage2.spec
index 2d25ab9c..72de0755 100644
--- a/specs/2004.3/amd64/stage2.spec
+++ b/specs/2004.3/amd64/stage2.spec
@@ -1,10 +1,10 @@
-# $Id: stage2.spec,v 1.4 2004-10-11 17:20:00 jhuebel Exp $
+# $Id: stage2.spec,v 1.5 2004-10-25 01:13:31 jhuebel Exp $
 
 subarch: amd64
-version_stamp: 20041011
+version_stamp: 20041022
 target: stage2
 rel_type: default
 rel_version: 2004.3
 profile: default-linux/amd64/2004.3
-snapshot: 20041011
-source_subpath: default/stage1-amd64-20041011
+snapshot: 20041022
+source_subpath: default/stage1-amd64-20041022
diff --git a/specs/2004.3/amd64/stage3.spec b/specs/2004.3/amd64/stage3.spec
index f56ae75a..584540f9 100644
--- a/specs/2004.3/amd64/stage3.spec
+++ b/specs/2004.3/amd64/stage3.spec
@@ -1,10 +1,10 @@
-# $Id: stage3.spec,v 1.3 2004-10-11 17:20:00 jhuebel Exp $
+# $Id: stage3.spec,v 1.4 2004-10-25 01:13:31 jhuebel Exp $
 
 subarch: amd64
-version_stamp: 20041011
+version_stamp: 20041022
 target: stage3
 rel_type: default
 rel_version: 2004.3
 profile: default-linux/amd64/2004.3
-snapshot: 20041011
-source_subpath: default/stage2-amd64-20041011
+snapshot: 20041022
+source_subpath: default/stage2-amd64-20041022