diff --git a/specs/2005.0/ppc/grp.spec b/specs/2005.0/ppc/grp.spec
index 9a81c91a..042b1f2f 100644
--- a/specs/2005.0/ppc/grp.spec
+++ b/specs/2005.0/ppc/grp.spec
@@ -1,4 +1,14 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/grp.spec,v 1.4 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+version_stamp: 2005.0
+target: grp
+rel_type: default
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+default_subpath: default/stage3-ppc-20050303
+
 grp: src cd2
+
 grp/use: 
 	pam
 	accessibility 
diff --git a/specs/2005.0/ppc/livecd-stage1.spec b/specs/2005.0/ppc/livecd-stage1.spec
index e554968a..1ab49a53 100644
--- a/specs/2005.0/ppc/livecd-stage1.spec
+++ b/specs/2005.0/ppc/livecd-stage1.spec
@@ -1,5 +1,11 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/livecd-stage1.spec,v 1.3 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+version_stamp: 2005.0
 target: livecd-stage1
+rel_type: default
 profile: default-linux/ppc/2005.0
+snapshot: 20050303
+default_subpath: default/stage3-ppc-20050303
 
 livecd/use: 
 	-* 
@@ -19,14 +25,17 @@ livecd/packages:
 	coldplug
 	curl
 	cvs
+	devfsd
 	device-mapper
 	dhcpcd
 	distcc
 	e2fsprogs
+	eject
 	ethtool
 	ftp
 	gentoolkit
 	gentoo-sources
+	pegasos-sources
 	gpm
 	hdparm
 	hfsplusutils
@@ -56,6 +65,7 @@ livecd/packages:
 	ntp
 	openssh
 	parted
+	pbbuttonsd
 	pciutils
 	popt
 	ppp
diff --git a/specs/2005.0/ppc/livecd-stage2.spec b/specs/2005.0/ppc/livecd-stage2-minimal.spec
similarity index 88%
rename from specs/2005.0/ppc/livecd-stage2.spec
rename to specs/2005.0/ppc/livecd-stage2-minimal.spec
index 0ee6530a..10290adb 100644
--- a/specs/2005.0/ppc/livecd-stage2.spec
+++ b/specs/2005.0/ppc/livecd-stage2-minimal.spec
@@ -1,41 +1,53 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/livecd-stage2-minimal.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+version_stamp: 2005.0
 target: livecd-stage2
+rel_type: default
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+default_subpath: default/livecd-stage1-ppc-20050303
 
+livecd/type: gentoo-release-minimal
 livecd/cdfstype: squashfs
 livecd/archscript: livecd/runscript/ppc-archscript.sh
 livecd/runscript: livecd/runscript/default-runscript.sh
 livecd/cdtar: livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
+livecd/overlay: /var/tmp/catalyst/overlay-minimal
+livecd/fsscript: livecd/fsscript/fsscript-ppc.sh
 
-boot/kernel: G3G4
+boot/kernel: G3G4 G5 Pegasos
 
 boot/kernel/G3G4/sources: sys-kernel/gentoo-sources
 boot/kernel/G3G4/use: extlib pcmcia usb -X
 boot/kernel/G3G4/config: /usr/src/configs/G3G4-SMP
-boot/kernel/G3G4/extraversion: G3G4-SMP-livecd
+boot/kernel/G3G4/extraversion: G3G4
 boot/kernel/G3G4/packages:
 	cryptsetup
+	pcmcia-cs
 
 boot/kernel/G5/sources: sys-kernel/gentoo-sources
 boot/kernel/G5/use: extlib usb -X
 boot/kernel/G5/config: /usr/src/configs/G5-SMP
-boot/kernel/G5/extraversion: G5-SMP-livecd
+boot/kernel/G5/extraversion: G5
 
 boot/kernel/Pegasos/sources: sys-kernel/pegasos-sources
-boot/kernel/Pegasos/config: /usr/src/configs/Pegasos-SMP
 boot/kernel/Pegasos/use: extlib usb -X
-boot/kernel/Pegasos/extraversion: Pegasos-SMP-livecd
+boot/kernel/Pegasos/config: /usr/src/configs/Pegasos-SMP
+boot/kernel/Pegasos/extraversion: Pegasos
+boot/kernel/Pegasos/gk_kernargs: --no-initrdmodules
+
+livecd/gk_mainargs: --makeopts=-j4 --lvm2 
+livecd/devmanager: udev
 
 livecd/iso: install-ppc-minimal-2005.0.iso
 livecd/volid: Gentoo Linux 2005.0 ppc
 
-livecd/devmanager: udev
-
 livecd/rcadd:
 	syslog-ng:default
 	gpm:default
+	pbbuttonsd:default
 
 livecd/unmerge:
-	acl
-	attr
 	autoconf
 	automake
 	binutils
@@ -54,16 +66,12 @@ livecd/unmerge:
 	gettext
 	sys-apps/texinfo
 	ccache
-	addpatches
 	man
 	groff
-	lib-compat
 	python
 	miscfiles
 	rsync
 	bc
-	lcms
-	libmng
 	genkernel
 	diffutils
 	libperl
diff --git a/specs/2005.0/ppc/livecd-stage2-universal.spec b/specs/2005.0/ppc/livecd-stage2-universal.spec
new file mode 100644
index 00000000..95dc5900
--- /dev/null
+++ b/specs/2005.0/ppc/livecd-stage2-universal.spec
@@ -0,0 +1,274 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/livecd-stage2-universal.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+version_stamp: 2005.0
+target: livecd-stage2
+rel_type: default
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+default_subpath: default/livecd-stage1-ppc-20050303
+
+livecd/type: gentoo-release-universal
+livecd/cdfstype: squashfs
+livecd/archscript: livecd/runscript/ppc-archscript.sh
+livecd/runscript: livecd/runscript/default-runscript.sh
+livecd/cdtar: livecd/cdtar/yaboot-1.3.13-cdtar.tar.bz2
+livecd/overlay: /var/tmp/catalyst/overlay-universal
+livecd/fsscript: livecd/fsscript/fsscript-ppc.sh
+
+boot/kernel: G3G4 G5 Pegasos
+
+boot/kernel/G3G4/sources: sys-kernel/gentoo-sources
+boot/kernel/G3G4/use: extlib pcmcia usb -X
+boot/kernel/G3G4/config: /usr/src/configs/G3G4-SMP
+boot/kernel/G3G4/extraversion: G3G4
+boot/kernel/G3G4/packages:
+	cryptsetup
+	pcmcia-cs
+
+boot/kernel/G5/sources: sys-kernel/gentoo-sources
+boot/kernel/G5/use: extlib usb -X
+boot/kernel/G5/config: /usr/src/configs/G5-SMP
+boot/kernel/G5/extraversion: G5
+
+boot/kernel/Pegasos/sources: sys-kernel/pegasos-sources
+boot/kernel/Pegasos/use: extlib usb -X
+boot/kernel/Pegasos/config: /usr/src/configs/Pegasos-SMP
+boot/kernel/Pegasos/extraversion: Pegasos
+boot/kernel/Pegasos/gk_kernargs: --no-initrdmodules
+
+livecd/gk_mainargs: --makeopts=-j4 --lvm2 
+livecd/devmanager: udev
+
+livecd/iso: install-ppc-universal-2005.0.iso
+livecd/volid: Gentoo Linux 2005.0 ppc
+
+livecd/rcadd:
+	syslog-ng:default
+	gpm:default
+	pbbuttonsd:default
+
+livecd/unmerge:
+	autoconf
+	automake
+	binutils
+	libtool
+	m4
+	bison
+	ccache
+	make
+	perl
+	patch
+	linux-headers
+	man-pages
+	sash
+	bison
+	flex
+	gettext
+	sys-apps/texinfo
+	ccache
+	man
+	groff
+	python
+	miscfiles
+	rsync
+	bc
+	genkernel
+	diffutils
+	libperl
+	gnuconfig
+	gcc-config
+	gcc
+	cpio
+	cronbase
+	ed
+	expat
+	help2man
+	libtool
+
+
+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
+	/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/*.pyc
+	/usr/lib/*.pyo
+	/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
+	/root/.bash_history
+	/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/ppc/snapshot.spec b/specs/2005.0/ppc/snapshot.spec
new file mode 100644
index 00000000..bedd18ab
--- /dev/null
+++ b/specs/2005.0/ppc/snapshot.spec
@@ -0,0 +1,3 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/snapshot.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+target: snapshot
+version_stamp: 20050303
diff --git a/specs/2005.0/ppc/stage1.spec b/specs/2005.0/ppc/stage1.spec
new file mode 100644
index 00000000..45fe7709
--- /dev/null
+++ b/specs/2005.0/ppc/stage1.spec
@@ -0,0 +1,9 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/stage1.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+target: stage1
+version_stamp: 2005.0
+rel_type: default
+rel_version: 2005.0
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+source_subpath: default/stage3-ppc-20050121
diff --git a/specs/2005.0/ppc/stage2.spec b/specs/2005.0/ppc/stage2.spec
new file mode 100644
index 00000000..501f68d4
--- /dev/null
+++ b/specs/2005.0/ppc/stage2.spec
@@ -0,0 +1,9 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/stage2.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+target: stage2
+version_stamp: 2005.0
+rel_type: default
+rel_version: 2005.0
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+source_subpath: default/stage1-ppc-20050303
diff --git a/specs/2005.0/ppc/stage3.spec b/specs/2005.0/ppc/stage3.spec
new file mode 100644
index 00000000..e159fff6
--- /dev/null
+++ b/specs/2005.0/ppc/stage3.spec
@@ -0,0 +1,10 @@
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2005.0/ppc/stage3.spec,v 1.1 2005-03-19 06:15:00 pylon Exp $
+subarch: ppc
+target: stage3
+version_stamp: 2005.0
+rel_type: default
+rel_version: 2005.0
+profile: default-linux/ppc/2005.0
+snapshot: 20050303
+source_subpath: default/stage2-x86-20050303
+