diff --git a/profiles/calculate/package.keywords/defaults b/profiles/calculate/package.keywords/defaults
index 452a22f7b..208ed3cc6 100644
--- a/profiles/calculate/package.keywords/defaults
+++ b/profiles/calculate/package.keywords/defaults
@@ -39,11 +39,9 @@
 
 ~net-wireless/b43-firmware-5.100.138 amd64 x86
 ~net-wireless/b43-fwcutter-015 amd64 x86
-~net-wireless/bluez-firmware-1.2 amd64 x86
 ~net-wireless/broadcom-sta-5.100.82.112 amd64 x86
 ~net-wireless/madwimax-0.1.1 amd64 x86
-~net-wireless/rtl8192su-firmware-2.6.0001.0320.2009 amd64 x86
-~sys-kernel/linux-firmware-20120924 amd64 x86
+~sys-kernel/linux-firmware-20130113 amd64 x86
 
 ~app-text/wgetpaste-2.18 amd64 x86
 
diff --git a/profiles/templates/3.1/6_ac_update_sync/world/1_create/wireless b/profiles/templates/3.1/6_ac_update_sync/world/1_create/wireless
index aed97f290..6fddf7322 100644
--- a/profiles/templates/3.1/6_ac_update_sync/world/1_create/wireless
+++ b/profiles/templates/3.1/6_ac_update_sync/world/1_create/wireless
@@ -2,12 +2,9 @@
 
 #?in(os_linux_shortname, CLD, CLDG, CLDX, CMC, CLS)!=#
 net-wireless/b43-firmware
-net-wireless/bluez-firmware
 net-wireless/broadcom-sta
 net-wireless/ipw2100-firmware
 net-wireless/ipw2200-firmware
-net-wireless/prism54-firmware
-net-wireless/rtl8192su-firmware
 net-wireless/wireless-tools
 net-wireless/wpa_supplicant
 net-wireless/zd1201-firmware
diff --git a/profiles/templates/3.1/6_ac_update_sync/world/2_update/06 b/profiles/templates/3.1/6_ac_update_sync/world/2_update/06
new file mode 100644
index 000000000..2eef10eda
--- /dev/null
+++ b/profiles/templates/3.1/6_ac_update_sync/world/2_update/06
@@ -0,0 +1,9 @@
+# Calculate format=world name=world ini(update.world)<6
+
+#-ini(update.world,6)-#
+
+#?in(os_linux_shortname, CLD, CLDG, CLDX, CMC, CLS)!=#
+!net-wireless/bluez-firmware
+!net-wireless/prism54-firmware
+!net-wireless/rtl8192su-firmware
+#os_linux_shortname#