diff --git a/device.mk b/device.mk
index 1636573..a068724 100644
--- a/device.mk
+++ b/device.mk
@@ -187,8 +187,12 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l.mk)
 
 # Thermal
 ifneq ($(TARGET_TEGRA_THERMAL),)
+ifeq ($(filter 3.10 4.9 5.10, $(TARGET_KERNEL_VERSION)),)
+TARGET_TEGRA_THERMAL_SUFFIX ?= .ack
+endif
+
 PRODUCT_PACKAGES += \
-    thermalhal.nx.xml
+    thermalhal.nx$(TARGET_TEGRA_THERMAL_SUFFIX).xml
 endif
 
 # WiFi
diff --git a/thermal/Android.bp b/thermal/Android.bp
index af15082..536717d 100644
--- a/thermal/Android.bp
+++ b/thermal/Android.bp
@@ -19,3 +19,9 @@ prebuilt_etc {
     src: "thermalhal.nx.xml",
     vendor: true,
 }
+
+prebuilt_etc {
+    name: "thermalhal.nx.ack.xml",
+    src: "thermalhal.nx.ack.xml",
+    vendor: true,
+}
diff --git a/thermal/thermalhal.nx.ack.xml b/thermal/thermalhal.nx.ack.xml
new file mode 100644
index 0000000..3e24a6c
--- /dev/null
+++ b/thermal/thermalhal.nx.ack.xml
@@ -0,0 +1,36 @@
+<!--ThermalHAL Config
+Attributes for thermal
+	These must be declared as a 'thermal-prop' element node
+	Attributes:
+		name - name of thermal device
+		type - type defined by AOSP
+		sensor-label - tz name
+		multiplier - converting factor to degree Celsius
+		cores - only for CPU type
+		threshold-label - to use a different temperature threshold
+Attributes for cooling
+	These must be declared as a 'cooling-prop' element node
+		name - name of cooling device
+		type - type defined by AOSP
+		cooling-path - node that represents cooling state
+Attributes for cpu-usages
+	These must be part of 'cpu_usages' element node
+		cpus - number of cpus in the platform-->
+<!-- TODO: port est changes from 4.9 -->
+<thermalhal>
+	<thermal_devices>
+		<thermal_device>
+			<thermal-prop name="CPU" type="DEVICE_TEMPERATURE_CPU" sensor-label="cpu-thermal" multiplier='0.001' />
+			<thermal-prop cores='4' />
+		</thermal_device>
+		<thermal_device>
+			<thermal-prop name="GPU" type="DEVICE_TEMPERATURE_GPU" sensor-label="gpu-thermal" multiplier='0.001' />
+		</thermal_device>
+	</thermal_devices>
+	<cooling_devices>
+		<cooling_device>
+			<cooling-prop name="FAN" type="FAN_RPM" cooling-path="/sys/class/hwmon/hwmon1/rpm" />
+		</cooling_device>
+	</cooling_devices>
+	<cpu_usages cpus="4" />
+</thermalhal>