diff --git a/config-generic b/config-generic
index d97f25fc3..f53f18bb1 100644
--- a/config-generic
+++ b/config-generic
@@ -674,7 +674,7 @@ CONFIG_TCP_MD5SIG=y
 # Networking options
 #
 CONFIG_PACKET=y
-# CONFIG_PACKET_DIAG is not set
+CONFIG_PACKET_DIAG=m
 CONFIG_UNIX=y
 CONFIG_UNIX_DIAG=m
 CONFIG_NET_KEY=m
diff --git a/kernel.spec b/kernel.spec
index 12f0aae3b..88669e0f2 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2292,6 +2292,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Apr 29 2013 Neil Horman <nhorman@redhat.com>
+- Enable CONFIG_PACKET_DIAG (rhbz 956870)
+
 * Mon Apr 29 2013 Josh Boyer <jwboyer@redhat.com>
 - Linux v3.9