diff --git a/BoardConfig.mk b/BoardConfig.mk
index 8d47c28..3e3d25d 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -98,6 +98,9 @@ BOARD_KERNEL_CMDLINE += androidboot.selinux=permissive
 TARGET_USES_ION := true
 TARGET_DISABLED_UBWC := true
 
+# NFC
+TARGET_USES_NQ_NFC := true
+
 # Partitions
 BOARD_BOOTIMAGE_PARTITION_SIZE := 134217728
 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
diff --git a/device.mk b/device.mk
index 66e2f0e..8182c62 100644
--- a/device.mk
+++ b/device.mk
@@ -177,6 +177,20 @@ PRODUCT_COPY_FILES += \
     frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml \
     frameworks/av/media/libstagefright/data/media_codecs_google_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video.xml
 
+# NFC
+PRODUCT_SOONG_NAMESPACES += \
+    vendor/nxp/opensource/sn100x
+
+PRODUCT_PACKAGES += \
+    com.android.nfc_extras \
+    com.nxp.nfc.nq \
+    NQNfcNci \
+    Tag
+
+PRODUCT_PACKAGES += \
+    nfc_nci.nqx.default.hw \
+    vendor.nxp.hardware.nfc@1.2-service
+
 # Overlay
 DEVICE_PACKAGE_OVERLAYS += \
     $(LOCAL_PATH)/overlay \