diff --git a/config-generic b/config-generic
index a1298aeee..b822a845f 100644
--- a/config-generic
+++ b/config-generic
@@ -1590,7 +1590,18 @@ CONFIG_BAYCOM_PAR=m
 CONFIG_BAYCOM_EPP=m
 CONFIG_YAM=m
 
-# CONFIG_NFC is not set
+CONFIG_NFC=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+CONFIG_NFC_LLCP=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_PN544_NFC=m
+CONFIG_PN544_HCI_NFC=m
+CONFIG_NFC_PN533=m
 
 #
 # IrDA (infrared) support
diff --git a/kernel.spec b/kernel.spec
index 3eba68d1b..0d563429e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2299,6 +2299,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Fri Jul 20 2012 John W. Linville <linville@redhat.com>
+- Enable NFC subsystem and drivers
+
 * Fri Jul 20 2012 Justin M. Forbes <jforbes@redhat.com> - 3.5.0-0.rc7.git4.1
 - Linux v3.5-rc7-141-g85efc72