diff --git a/kernel.spec b/kernel.spec
index d0d0d6783..c82d3359b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2213,6 +2213,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Tue Dec 06 2011 Josh Boyer <jwboyer@redhat.com>
+- Move 802.1q back into the main kernel package
+
 * Mon Dec 05 2011 Josh Boyer <jwboyer@redhat.com>
 - Only print the apm_cpu_idle message once (rhbz #760341)
 
diff --git a/mod-extra.list b/mod-extra.list
index 2b605656f..870b8c716 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -32,7 +32,6 @@ l2tp_eth.ko
 l2tp_ip.ko
 l2tp_netlink.ko
 l2tp_ppp.ko
-8021q.ko
 llc.ko
 ipx.ko
 appletalk.ko