diff --git a/BoardConfig.mk b/BoardConfig.mk
index 1bf456e..2eb92a2 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -61,5 +61,9 @@ WIFI_DRIVER_FW_PATH_AP := "ap"
 WIFI_DRIVER_FW_PATH_STA := "sta"
 WPA_SUPPLICANT_VERSION := VER_0_8_X
 
+#FM Radio
+AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true
+TARGET_QCOM_NO_FM_FIRMWARE := true
+
 # inherit from the proprietary version
 -include vendor/lge/d855/BoardConfigVendor.mk
diff --git a/device.mk b/device.mk
index 0b55073..b349fea 100644
--- a/device.mk
+++ b/device.mk
@@ -50,6 +50,11 @@ PRODUCT_PACKAGES += \
     NfcNci \
     nfc_nci.pn54x.default
 
+# FM Radio
+PRODUCT_PACKAGES += \
+    FMRadio \
+    libfmjni
+
 PRODUCT_COPY_FILES += \
     device/lge/g3-common/wcnss/WCNSS_cfg.dat:system/etc/firmware/wlan/prima/WCNSS_cfg.dat \
     device/lge/g3-common/wcnss/WCNSS_qcom_cfg.ini:system/etc/wifi/WCNSS_qcom_cfg.ini \