diff --git a/configs/thermal-engine.conf b/configs/thermal-engine.conf
new file mode 100644
index 0000000..fc89427
--- /dev/null
+++ b/configs/thermal-engine.conf
@@ -0,0 +1,222 @@
+# SENSOR : ALIAS
+# tsens_tz_sensor2 : pop_mem
+# tsens_tz_sensor10 : gpu
+# tsens_tz_sensor9 : cpu4-cpu5-cpu6-cpu7
+# tsens_tz_sensor8 : cpu3
+# tsens_tz_sensor7 : cpu2
+# tsens_tz_sensor6 : cpu1
+# tsens_tz_sensor5 : cpu0
+# tsens_tz_sensor4 : L2_cache_1
+
+debug
+#Conf file: /system/etc/thermal-engine.conf
+[CAMERA_CAMCORDER_MONITOR]
+algo_type monitor
+sampling 1000
+sensor case_therm
+thresholds 40000 430000
+thresholds_clr 37000 40000
+actions camera+camcorder camera+camcorder
+action_info 1+1 2+2
+
+[CPU0_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 1000
+sensor case_therm
+thresholds 42000
+thresholds_clr 39000
+actions hotplug_2
+action_info 1
+
+[CPU1_HOTPLUG_MONITOR]
+algo_type monitor
+sampling 1000
+sensor case_therm
+thresholds 44000
+thresholds_clr 41000
+actions hotplug_1
+action_info 1
+
+[SS-CASE-THERM]
+algo_type ss
+sampling 1000
+sensor case_therm
+device cpu_voltage
+set_point 41000
+set_point_clr 39000
+time_constant 3
+device_perf_floor 902400
+
+[BATTERY_CHARGING_CTL]
+algo_type monitor
+sampling 10000
+sensor case_therm
+thresholds 41000 42000 45000 48000
+thresholds_clr 38000 41000 42000 45000
+actions battery battery battery battery
+action_info 1 2 3 4
+
+[SS-GPU]
+algo_type ss
+sampling 250
+sensor gpu
+device gpu
+set_point 95000
+set_point_clr 65000
+time_constant 0
+
+[VIRTUAL-CPUS]
+#algo_type virtual
+trip_sensor tsens_tz_sensor5
+set_point 75000
+set_point_clr 65000
+sensors tsens_tz_sensor5 tsens_tz_sensor6 tsens_tz_sensor7 tsens_tz_sensor8 tsens_tz_sensor9
+weights
+sampling 50
+math 2
+
+[SS-GPU-CASE-THERM]
+#algo_type ss
+sampling 10000
+sensor case_therm
+device gpu
+set_point 50000
+set_point_clr 45000
+time_constant 0
+device_max_limit 375000000
+
+[SS-POPMEM]
+#algo_type ss
+sampling 250
+sensor pop_mem
+device cpu_voltage
+set_point 70000
+set_point_clr 55000
+time_constant 2
+
+[SS-CPUS]
+#algo_type ss
+sampling 50
+sensor VIRTUAL-CPUS
+device cpu_voltage
+set_point 85000
+set_point_clr 55000
+time_constant 0
+
+[SPEAKER-CAL]
+sampling 30000 30000 10 1800000
+sensor pm8937_tz
+sensors tsens_tz_sensor1 tsens_tz_sensor2 tsens_tz_sensor3 tsens_tz_sensor10
+temp_range 6000 10000 2000
+max_temp 45000
+offset -4000
+
+[VDD_RSTR_MONITOR-TSENS10]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor10
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS9]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor9
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS8]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor8
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS7]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor7
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS6]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor6
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS5]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor5
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS4]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor4
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS3]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor3
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS2]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor2
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS1]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor1
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
+
+[VDD_RSTR_MONITOR-TSENS0]
+#algo_type monitor
+sampling 1000
+sensor tsens_tz_sensor0
+thresholds 5000
+thresholds_clr 10000
+actions vdd_restriction
+action_info 1
+descending
diff --git a/product/qcom-thermal.mk b/product/qcom-thermal.mk
new file mode 100644
index 0000000..df78f04
--- /dev/null
+++ b/product/qcom-thermal.mk
@@ -0,0 +1,3 @@
+# Thermal
+PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/thermal-engine.conf:system/etc/thermal-engine.conf
diff --git a/proprietary-files.txt b/proprietary-files.txt
index 2f1498b..2b1db4f 100644
--- a/proprietary-files.txt
+++ b/proprietary-files.txt
@@ -1503,7 +1503,6 @@ vendor/lib64/sensors.ssc.so
 bin/ssr_diag
 
 # Thermal
-etc/thermal-engine.conf
 vendor/bin/thermal-engine
 vendor/lib/libthermalclient.so
 vendor/lib64/libthermalclient.so