diff --git a/specs/2006.1/amd64/livecd-stage1-gnome.spec b/specs/2006.1/amd64/livecd-stage1-gnome.spec
index d78891f1..e6f00cd4 100644
--- a/specs/2006.1/amd64/livecd-stage1-gnome.spec
+++ b/specs/2006.1/amd64/livecd-stage1-gnome.spec
@@ -49,14 +49,14 @@ livecd/packages:
 	media-sound/audacious
 	media-sound/rhythmbox
 	media-video/mplayer
-	net-analyzer/ettercap
+#	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/bpalogin
 	net-dialup/mingetty
 	net-dialup/minicom
 #	net-dialup/penggy
@@ -72,20 +72,20 @@ livecd/packages:
 	net-misc/iputils
 	net-misc/rdate
 	net-misc/vconfig
-	net-misc/vpnc
+#	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/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
+#	net-wireless/zd1201-firmware
+#	sys-apps/apmd
 	sys-apps/coldplug
 	sys-apps/eject
 	sys-apps/ethtool
@@ -103,8 +103,8 @@ livecd/packages:
 #	sys-apps/ibm-powerpc-utils-papr
 	sys-apps/slocate
 	sys-apps/smartmontools
-	sys-block/gpart
-	sys-block/partimage
+#	sys-block/gpart
+#	sys-block/partimage
 #	sys-boot/aboot
 	sys-boot/grub
 	sys-boot/lilo
@@ -141,6 +141,8 @@ livecd/packages:
 	x11-base/xorg-x11
 	x11-drivers/synaptics
 	x11-misc/xscreensaver
+	x11-themes/gdm-themes-livecd
+	x11-themes/gentoo-artwork-livecd
 #	x11-wm/enlightenment
 #	x11-wm/fluxbox
 #	xfce-base/xfce4
diff --git a/specs/2006.1/amd64/livecd-stage2-gnome.spec b/specs/2006.1/amd64/livecd-stage2-gnome.spec
index d681ab01..e64c2a75 100644
--- a/specs/2006.1/amd64/livecd-stage2-gnome.spec
+++ b/specs/2006.1/amd64/livecd-stage2-gnome.spec
@@ -38,18 +38,9 @@ boot/kernel/gentoo/packages:
 	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
+	sys-fs/cryptsetup-luks
 	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