diff --git a/BoardConfig.mk b/BoardConfig.mk
index df02adc..ddb5d44 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -87,6 +87,10 @@
 # DRM
 TARGET_ENABLE_MEDIADRM_64 := true
 
+# FM
+BOARD_HAS_QCA_FM_SOC := "cherokee"
+BOARD_HAVE_QCOM_FM := true
+
 # Global
 BOARD_USES_QCOM_HARDWARE := true
 TARGET_SPECIFIC_HEADER_PATH := $(DEVICE_PATH)/include
diff --git a/device.mk b/device.mk
index 0544223..b6e8235 100755
--- a/device.mk
+++ b/device.mk
@@ -95,6 +95,14 @@
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
 
+# FM
+PRODUCT_PACKAGES += \
+    FM2 \
+    libqcomfm_jni \
+    qcom.fmradio
+
+PRODUCT_BOOT_JARS += qcom.fmradio
+
 # Input
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/keylayout/fts_ts.kl:system/usr/keylayout/fts_ts.kl \
diff --git a/omni.dependencies b/omni.dependencies
index 79dc9c6..b8c5ab0 100644
--- a/omni.dependencies
+++ b/omni.dependencies
@@ -22,5 +22,11 @@
     "repository": "android_packages_apps_SnapdragonCamera2",
     "target_path": "packages/apps/SnapdragonCamera2",
     "revision": "android-9.0"
-  }
+  },
+  {
+     "remote": "omnirom",
+     "repository": "android_vendor_qcom_opensource_fm-commonsys",
+     "target_path": "vendor/qcom/opensource/fm-commonsys",
+     "revision": "android-9.0"
+   }
 ]
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 350957c..9777619 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -76,6 +76,14 @@
 lib64/libdpmtcm.so
 -priv-app/dpmserviceapp/dpmserviceapp.apk
 
+# FM
+lib/fm_helium.so
+lib/libfm-hci.so
+-lib/vendor.qti.hardware.fm@1.0.so
+lib64/fm_helium.so
+lib64/libfm-hci.so
+-lib64/vendor.qti.hardware.fm@1.0.so
+
 # HotwordEnrollment
 -priv-app/HotwordEnrollmentOKGoogleWCD9340/HotwordEnrollmentOKGoogleWCD9340.apk
 -priv-app/HotwordEnrollmentXGoogleWCD9340/HotwordEnrollmentXGoogleWCD9340.apk
diff --git a/system.prop b/system.prop
index 7786d61..15400ad 100644
--- a/system.prop
+++ b/system.prop
@@ -32,6 +32,9 @@
 #Enable virtual display.
 debug.sf.enable_hwc_vds=1
 
+# FM
+vendor.bluetooth.soc=cherokee
+
 # Media
 media.settings.xml=/system/etc/media_profiles_vendor.xml