diff --git a/specs/2007.1/ChangeLog b/specs/2007.1/ChangeLog
index f20335b2..07d0c483 100644
--- a/specs/2007.1/ChangeLog
+++ b/specs/2007.1/ChangeLog
@@ -1,5 +1,9 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.21 2007-11-01 20:24:03 agaffney Exp $
+# $Header: /var/cvsroot/gentoo/src/releng/specs/2007.1/ChangeLog,v 1.22 2007-11-06 21:15:17 wolf31o2 Exp $
+
+  06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+  amd64/livecd-stage2.spec, amd64/livedvd-stage1.spec:
+  Commenting a few packages which are masked on amd64.
 
   01 Nov 2007; Andrew Gaffney <agaffney@gentoo.org>
   alpha/livecd-stage2.spec, amd64/livecd-stage2.spec,
diff --git a/specs/2007.1/amd64/livecd-stage2.spec b/specs/2007.1/amd64/livecd-stage2.spec
index 7dcebe95..7cb08ed8 100644
--- a/specs/2007.1/amd64/livecd-stage2.spec
+++ b/specs/2007.1/amd64/livecd-stage2.spec
@@ -9,11 +9,10 @@ source_subpath: default/livecd-stage1-amd64-installer-2007.1
 livecd/fstype: squashfs
 livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-elilo-memtest86+-cdtar.tar.bz2
 livecd/iso: /var/tmp/catalyst/builds/default/livecd-amd64-installer-2007.1.iso
-livecd/splash_type: gensplash
-livecd/splash_theme: livecd-2007.1
-livecd/xdm: gdm
+#livecd/splash_type: gensplash
+#livecd/splash_theme: livecd-2007.1
 livecd/xsession: xfce
-livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh
+#livecd/fsscript: /root/livecd/scripts/2007.1/livecd.sh
 
 livecd/type: gentoo-release-livecd
 livecd/users: gentoo
@@ -23,12 +22,12 @@ livecd/overlay: /root/livecd/overlays/2007.1/common/overlay/livecd
 livecd/root_overlay: /root/livecd/overlays/2007.1/common/root_overlay
 
 livecd/bootargs: dokeymap
-livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --evms --unionfs-dev
+livecd/gk_mainargs: --makeopts=-j16 --lvm --dmraid --evms --mdadm
 
 boot/kernel: gentoo
 boot/kernel/gentoo/sources: gentoo-sources
 
-boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/livecd-2.6.19.config
+boot/kernel/gentoo/config: /root/livecd/kconfig/2007.1/amd64/livecd-2.6.22.config
 
 boot/kernel/gentoo/use: pcmcia usb oss atm
 
@@ -38,18 +37,23 @@ boot/kernel/gentoo/packages:
 	media-libs/alsa-lib
 	media-libs/alsa-oss
 	media-sound/alsa-utils
+### Masked
 #	net-dialup/fcdsl
+### Masked
 #	net-dialup/fritzcapi
+### Masked
 #	net-dialup/globespan-adsl
+### Masked
 #	net-dialup/slmodem
+### Masked
 #	net-wireless/acx
 	net-wireless/hostap-utils
 	net-wireless/ipw3945
 	net-wireless/madwifi-ng-tools
 	net-wireless/rt2500
+### Masked
 #	net-wireless/rtl8187
 	sys-apps/pcmciautils
-	sys-fs/cryptsetup
 
 livecd/empty:
 	/var/tmp
diff --git a/specs/2007.1/amd64/livedvd-stage1.spec b/specs/2007.1/amd64/livedvd-stage1.spec
index 374be795..a8a461ec 100644
--- a/specs/2007.1/amd64/livedvd-stage1.spec
+++ b/specs/2007.1/amd64/livedvd-stage1.spec
@@ -20,7 +20,8 @@ livecd/packages:
 	app-admin/sudo
 	app-admin/superadduser
 	app-admin/syslog-ng
-	app-admin/testdisk
+### Masked
+#	app-admin/testdisk
 	app-arch/alien
 	app-arch/mt-st
 	app-arch/unrar
@@ -46,7 +47,8 @@ livecd/packages:
 	app-misc/mc
 	app-misc/pax-utils
 	app-misc/screen
-	app-misc/splitvt
+### Masked
+#	app-misc/splitvt
 	app-misc/vlock
 	app-office/dia
 	app-office/gnucash
@@ -83,7 +85,8 @@ livecd/packages:
 	dev-util/valgrind
 	gnome-base/gnome
 	gnome-extra/evolution-exchange
-	gnome-extra/gsynaptics
+### Masked
+#	gnome-extra/gsynaptics
 	gnome-extra/sensors-applet
 	kde-base/kde-meta
 	kde-base/kooka
@@ -91,7 +94,8 @@ livecd/packages:
 	mail-client/mozilla-thunderbird
 	mail-client/sylpheed
 	mail-client/claws-mail
-	media-gfx/blender
+### Masked
+#	media-gfx/blender
 	media-gfx/digikam
 	media-gfx/fbgrab
 	media-gfx/gimp
@@ -126,7 +130,8 @@ livecd/packages:
 	net-analyzer/wireshark
 	net-dialup/mingetty
 	net-dialup/minicom
-	net-dialup/penggy
+### Masked
+#	net-dialup/penggy
 	net-dialup/pptpclient
 	net-dialup/rp-pppoe
 	net-firewall/iptables