diff --git a/config-generic b/config-generic
index ae0bd82..755c7c6 100644
--- a/config-generic
+++ b/config-generic
@@ -174,7 +174,7 @@ CONFIG_INFINIBAND_QIB=m
 CONFIG_BINFMT_ELF=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 # CONFIG_BINFMT_AOUT is not set
-CONFIG_BINFMT_MISC=y
+CONFIG_BINFMT_MISC=m
 
 #
 # Device Drivers
diff --git a/kernel.spec b/kernel.spec
index ba11f1a..fc69268 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1876,6 +1876,9 @@ fi
 # and build.
 
 %changelog
+* Mon Jul 11 2011 Dave Jones <davej@redhat.com>
+- Change BINFMT_MISC to be modular. (rhbz 695415)
+
 * Sun Jul 10 2011 Kyle McMartin <kmcmartin@redhat.com> 3.0-0.rc6.git6.1
 - Linux 3.0-rc6-git6
 - iwlagn-fix-dma-direction.patch: drop.