diff --git a/releases/weekly/specs/amd64/installcd-stage1.spec b/releases/weekly/specs/amd64/installcd-stage1.spec
index 5dfd0d6f..2ea29507 100644
--- a/releases/weekly/specs/amd64/installcd-stage1.spec
+++ b/releases/weekly/specs/amd64/installcd-stage1.spec
@@ -13,6 +13,7 @@ livecd/use:
 	livecd
 	loop-aes
 	lvm1
+	modules
 	ncurses
 	nls
 	nptl
@@ -39,8 +40,6 @@ livecd/packages:
 	media-gfx/fbgrab
 	net-analyzer/traceroute
 	net-dialup/mingetty
-### Masked (no keywords)
-#	net-dialup/penggy
 	net-dialup/pptpclient
 	net-dialup/rp-pppoe
 	net-fs/mount-cifs
@@ -74,26 +73,12 @@ livecd/packages:
 	sys-apps/hdparm
 	sys-apps/hwsetup
 	sys-apps/iproute2
-### Masked (no keywords)
-#	sys-apps/lssbus
 	sys-apps/memtester
 	sys-apps/netplug
 	sys-block/parted
-### Masked (no keywords)
-#	sys-apps/powerpc-utils
-### Masked (no keywords)
-#	sys-apps/ibm-powerpc-utils
-### Masked (no keywords)
-#	sys-apps/ibm-powerpc-utils-papr
 	sys-apps/sdparm
 	sys-block/partimage
 	sys-block/qla-fc-firmware
-### Masked (no keywords)
-#	sys-boot/yaboot
-### Masked (no keywords)
-#	sys-devel/binutils-hppa64
-### Masked (no keywords)
-#	sys-devel/gcc-hppa64
 	sys-fs/cryptsetup
 	sys-fs/dmraid
 	sys-fs/dosfstools
@@ -102,12 +87,9 @@ livecd/packages:
 ### Masked (no keywords)
 #	sys-fs/hfsplusutils
 	sys-fs/hfsutils
-### Masked (no keywords)
-#	sys-fs/iprutils
 	sys-fs/jfsutils
 	sys-fs/lsscsi
 	sys-fs/lvm2
-#	sys-fs/lvm-user
 	sys-fs/mac-fdisk
 	sys-fs/mdadm
 	sys-fs/multipath-tools
@@ -116,6 +98,4 @@ livecd/packages:
 	sys-fs/xfsprogs
 	sys-libs/gpm
 	sys-power/acpid
-### Masked (no keywords)
-#	sys-power/apmd
 	www-client/links
diff --git a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
index c0e8b83c..51a14474 100644
--- a/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/amd64/installcd-stage2-minimal.spec
@@ -58,6 +58,7 @@ boot/kernel/gentoo/use:
 	lvm1
 	midi
 	mng
+	modules
 	ncurses
 	nls
 	nptl
diff --git a/releases/weekly/specs/x86/hardened/installcd-stage1.spec b/releases/weekly/specs/x86/hardened/installcd-stage1.spec
index 8c9d2929..a65ebe9d 100644
--- a/releases/weekly/specs/x86/hardened/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/hardened/installcd-stage1.spec
@@ -11,7 +11,9 @@ livecd/use:
 	fbcon
 	ipv6
 	livecd
+	loop-aes
 	lvm1
+	modules
 	ncurses
 #	nls
 	pam
@@ -37,8 +39,6 @@ livecd/packages:
 	net-analyzer/tcptraceroute
 	net-analyzer/traceroute
 	net-dialup/mingetty
-### Masked (for removal)
-#	net-dialup/penggy
 	net-dialup/pptpclient
 	net-dialup/rp-pppoe
 	net-fs/nfs-utils
@@ -68,30 +68,22 @@ livecd/packages:
 	sys-apps/hdparm
 	sys-apps/hwsetup
 	sys-apps/iproute2
-#	sys-apps/lssbus
 	sys-apps/memtester
 	sys-apps/netplug
 	sys-block/parted
-#	sys-apps/powerpc-utils
-#	sys-apps/ibm-powerpc-utils
-#	sys-apps/ibm-powerpc-utils-papr
 	sys-apps/sdparm
 #	sys-block/partimage
 #	sys-block/qla-fc-firmware
-#	sys-boot/yaboot
-#	sys-devel/binutils-hppa64
-#	sys-devel/gcc-hppa64
+	sys-fs/cryptsetup
 	sys-fs/dmraid
 	sys-fs/dosfstools
 	sys-fs/e2fsprogs
 	sys-fs/evms
 #	sys-fs/hfsplusutils
 #	sys-fs/hfsutils
-#	sys-fs/iprutils
 	sys-fs/jfsutils
 	sys-fs/lsscsi
 	sys-fs/lvm2
-#	sys-fs/lvm-user
 #	sys-fs/mac-fdisk
 	sys-fs/mdadm
 #	sys-fs/multipath-tools
@@ -100,5 +92,4 @@ livecd/packages:
 	sys-fs/xfsprogs
 	sys-libs/gpm
 	sys-power/acpid
-#	sys-power/apmd
 	www-client/links
diff --git a/releases/weekly/specs/x86/installcd-stage1.spec b/releases/weekly/specs/x86/installcd-stage1.spec
index c0572fe8..98f51e6e 100644
--- a/releases/weekly/specs/x86/installcd-stage1.spec
+++ b/releases/weekly/specs/x86/installcd-stage1.spec
@@ -13,6 +13,7 @@ livecd/use:
 	livecd
 	loop-aes
 	lvm1
+	modules
 	ncurses
 	nls
 	pam
@@ -37,8 +38,6 @@ livecd/packages:
 	media-gfx/fbgrab
 	net-analyzer/traceroute
 	net-dialup/mingetty
-### Masked (for removal)
-#	net-dialup/penggy
 	net-dialup/pptpclient
 	net-dialup/rp-pppoe
 	net-fs/mount-cifs
@@ -71,19 +70,12 @@ livecd/packages:
 	sys-apps/hdparm
 	sys-apps/hwsetup
 	sys-apps/iproute2
-#	sys-apps/lssbus
 	sys-apps/memtester
 	sys-apps/netplug
 	sys-block/parted
-#	sys-apps/powerpc-utils
-#	sys-apps/ibm-powerpc-utils
-#	sys-apps/ibm-powerpc-utils-papr
 	sys-apps/sdparm
 	sys-block/partimage
 #	sys-block/qla-fc-firmware
-#	sys-boot/yaboot
-#	sys-devel/binutils-hppa64
-#	sys-devel/gcc-hppa64
 	sys-fs/cryptsetup
 	sys-fs/dmraid
 	sys-fs/dosfstools
@@ -91,11 +83,9 @@ livecd/packages:
 	sys-fs/evms
 #	sys-fs/hfsplusutils
 #	sys-fs/hfsutils
-#	sys-fs/iprutils
 	sys-fs/jfsutils
 	sys-fs/lsscsi
 	sys-fs/lvm2
-#	sys-fs/lvm-user
 #	sys-fs/mac-fdisk
 	sys-fs/mdadm
 #	sys-fs/multipath-tools
@@ -104,5 +94,4 @@ livecd/packages:
 	sys-fs/xfsprogs
 	sys-libs/gpm
 	sys-power/acpid
-#	sys-power/apmd
 	www-client/links
diff --git a/releases/weekly/specs/x86/installcd-stage2-minimal.spec b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
index bbae967e..290942ae 100644
--- a/releases/weekly/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/weekly/specs/x86/installcd-stage2-minimal.spec
@@ -58,6 +58,7 @@ boot/kernel/gentoo/use:
 	lvm1
 	midi
 	mng
+	modules
 	ncurses
 	nls
 	nptl