diff --git a/config-generic b/config-generic
index 11293a8b3..7f21d3e0f 100644
--- a/config-generic
+++ b/config-generic
@@ -1166,7 +1166,7 @@ CONFIG_NET_SCH_MULTIQ=m
 CONFIG_NET_SCH_CHOKE=m
 CONFIG_NET_SCH_QFQ=m
 CONFIG_NET_SCH_CODEL=m
-CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=y
 CONFIG_NET_SCH_FQ=m
 CONFIG_NET_SCH_HHF=m
 CONFIG_NET_SCH_PIE=m
@@ -1703,7 +1703,7 @@ CONFIG_B43_DEBUG=y
 CONFIG_B43_PHY_LP=y
 CONFIG_B43_PHY_N=y
 CONFIG_B43_PHY_HT=y
-# CONFIG_B43_PHY_G is not set
+CONFIG_B43_PHY_G=y
 CONFIG_B43LEGACY=m
 CONFIG_B43LEGACY_DEBUG=y
 CONFIG_B43LEGACY_DMA=y
diff --git a/kernel.spec b/kernel.spec
index f83f7fc50..460714ba8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2202,6 +2202,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Fri Oct 17 2014 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable B43_PHY_G to fix b43 driver regression (rhbz 1152502)
+
 * Wed Oct 15 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc0.git9.3
 - Revert Btrfs ro snapshot commit that causes filesystem corruption