diff --git a/config-generic b/config-generic
index f796b90f2..fa5645559 100644
--- a/config-generic
+++ b/config-generic
@@ -2067,7 +2067,8 @@ CONFIG_NFC_ST21NFCA=m
 CONFIG_NFC_ST21NFCA_I2C=m
 # CONFIG_NFC_ST21NFCB is not set
 # CONFIG_NFC_ST21NFCB_I2C is not set
-# CONFIG_NFC_NXP_NCI is not set
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
 # CONFIG_NFC_NCI_SPI is not set
 # CONFIG_NFC_NCI_UART is not set
 # CONFIG_NFC_ST_NCI is not set
diff --git a/kernel.spec b/kernel.spec
index 57c8bfd1e..11f9a9940 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2100,6 +2100,7 @@ fi
 # 
 %changelog
 * Wed May 04 2016 Josh Boyer <jwboyer@fedoraproject.org>
+- Enable NFC_NXP_NCI options (rhbz 1290556)
 - CVE-2016-4482 info leak in devio.c (rhbz 1332931 1332932)
 
 * Fri Apr 29 2016 Peter Robinson <pbrobinson@fedoraproject.org>