diff --git a/config-generic b/config-generic
index 0c1304053..0a6785bce 100644
--- a/config-generic
+++ b/config-generic
@@ -816,7 +816,7 @@ CONFIG_IP_VS_NQ=m
 CONFIG_IP_VS_FTP=m
 CONFIG_IP_VS_PE_SIP=m
 
-CONFIG_IPV6=y
+CONFIG_IPV6=m
 CONFIG_IPV6_PRIVACY=y
 CONFIG_IPV6_ROUTER_PREF=y
 CONFIG_IPV6_ROUTE_INFO=y
diff --git a/kernel.spec b/kernel.spec
index 41908fa98..09eb2e953 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1821,6 +1821,9 @@ fi
 # and build.
 
 %changelog
+* Fri Aug 05 2011 Dave Jones <davej@redhat.com>
+- Revert f16-only change that made IPV6 built-in.
+
 * Fri Aug 05 2011 Dave Jones <davej@redhat.com>
 - Final 3.0.1 diff.