diff --git a/releases/2008.0/ChangeLog b/releases/2008.0/ChangeLog
index 230c8bfb..37b8ebb0 100644
--- a/releases/2008.0/ChangeLog
+++ b/releases/2008.0/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Apr 2008; Andrew Gaffney <agaffney@gentoo.org>
+  specs/x86/i686/livecd-stage2.spec, specs/x86/i686/livedvd-stage2.spec,
+  specs/x86/installcd-stage2-minimal.spec:
+  Comment out net-wireless/ipw3945 and net-wireless/rt2500 since both are
+  replaced by in-kernel stuff
+
   23 Apr 2008; Andrew Gaffney <agaffney@gentoo.org>
   specs/x86/installcd-stage2-minimal.spec:
   Comment out slmodem due to compile failure against 2.6.24
diff --git a/releases/2008.0/specs/x86/i686/livecd-stage2.spec b/releases/2008.0/specs/x86/i686/livecd-stage2.spec
index daf30fb8..738f2ea7 100644
--- a/releases/2008.0/specs/x86/i686/livecd-stage2.spec
+++ b/releases/2008.0/specs/x86/i686/livecd-stage2.spec
@@ -37,9 +37,11 @@ boot/kernel/gentoo/packages:
 ### Compile failure
 #	net-wireless/acx
 	net-wireless/hostap-utils
-	net-wireless/ipw3945
+### In-kernel
+#	net-wireless/ipw3945
 #	net-wireless/madwifi-ng-tools
-	net-wireless/rt2500
+### Compile failure and in-kernel
+#	net-wireless/rt2500
 #	net-wireless/rtl8187
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
diff --git a/releases/2008.0/specs/x86/i686/livedvd-stage2.spec b/releases/2008.0/specs/x86/i686/livedvd-stage2.spec
index c641c377..5ba8e49c 100644
--- a/releases/2008.0/specs/x86/i686/livedvd-stage2.spec
+++ b/releases/2008.0/specs/x86/i686/livedvd-stage2.spec
@@ -39,9 +39,11 @@ boot/kernel/gentoo/packages:
 #	net-wireless/acx
 	net-wireless/hostap-utils
 	net-wireless/kismet
-	net-wireless/ipw3945
+### In-kernel
+#	net-wireless/ipw3945
 #	net-wireless/madwifi-ng-tools
-	net-wireless/rt2500
+### Compile failure and in-kernel
+#	net-wireless/rt2500
 #	net-wireless/rtl8187
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g
diff --git a/releases/2008.0/specs/x86/installcd-stage2-minimal.spec b/releases/2008.0/specs/x86/installcd-stage2-minimal.spec
index 020f120c..a9fbccea 100644
--- a/releases/2008.0/specs/x86/installcd-stage2-minimal.spec
+++ b/releases/2008.0/specs/x86/installcd-stage2-minimal.spec
@@ -49,9 +49,11 @@ boot/kernel/gentoo/packages:
 	net-wireless/hostap-utils
 #	net-dialup/fritzcapi
 #	net-dialup/fcdsl
-	net-wireless/rt2500
+### Compile failure and in-kernel
+#	net-wireless/rt2500
 #	net-wireless/acx
-	net-wireless/ipw3945
+### In-kernel
+#	net-wireless/ipw3945
 	sys-apps/pcmciautils
 	sys-fs/ntfs3g