diff --git a/config-generic b/config-generic
index 8ae2916f0..80ada65a0 100644
--- a/config-generic
+++ b/config-generic
@@ -4240,7 +4240,7 @@ CONFIG_USB_ATMEL=m
 # CONFIG_VIDEO_CX25821 is not set
 # CONFIG_R8187SE is not set
 # CONFIG_RTL8192U is not set
-# CONFIG_BATMAN_ADV is not set
+CONFIG_BATMAN_ADV=m
 # CONFIG_FB_SM7XX is not set
 # CONFIG_SPECTRA is not set
 # CONFIG_ZRAM is not set
diff --git a/kernel.spec b/kernel.spec
index 2b39e4a43..5ca5ca5ad 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2288,6 +2288,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Wed Jul 31 2012 John W. Linville <linville@redhat.com>
+- Enable batman-adv and add it to the list of "extra" modules
+
 * Tue Jul 31 2012 Dave Jones <davej@redhat.com>
 - Change VM_BUG_ON's to be WARN_ONs instead.
 
diff --git a/mod-extra.list b/mod-extra.list
index 4becf4d65..c35fb625f 100644
--- a/mod-extra.list
+++ b/mod-extra.list
@@ -171,3 +171,4 @@ tpm_nsc.ko
 tpm_tis.ko
 slip.ko
 nilfs2.ko
+batman-adv.ko