diff --git a/contrib/thermald/surface_pro_7/README.md b/contrib/thermald/surface_pro_7/README.md
new file mode 100644
index 000000000..3f9c63d14
--- /dev/null
+++ b/contrib/thermald/surface_pro_7/README.md
@@ -0,0 +1,11 @@
+# Using thermald to avoid thermal throttling
+1. Install `thermald` for your distro, on many distros it might be installed by default
+2. Place thermal-conf.xml into the `/etc/thermald/` directory
+3. Depending on your ambient temperature you might want to lower the `<Temperature>` line to make thermald kick in more aggressively. (65000 = 65°C)
+4. Place thermal-cpu-cdev-order.xml into the `/etc/thermald/` directory
+5. `sudo systemctl restart thermald`
+
+# Making Fedora respect your config files
+Fedora uses the `--adaptive` option by default, thus ignoring your config files. This might also apply to some other distros.
+
+Edit `/usr/lib/systemd/system/thermald.service` and remove `--adaptive` from the `ExecStart=` line. Then do a `systemctl daemon-reload` so systemd realizes the change. Thermald should then respect your configuration files.
diff --git a/contrib/thermald/surface_pro_7/thermal-conf.xml b/contrib/thermald/surface_pro_7/thermal-conf.xml
new file mode 100644
index 000000000..4cf0da183
--- /dev/null
+++ b/contrib/thermald/surface_pro_7/thermal-conf.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<ThermalConfiguration>
+<Platform>
+	<Name>Surface Pro 7 Thermal Workaround</Name>
+	<ProductName>*</ProductName>
+	<Preference>QUIET</Preference>
+	<ThermalZones>
+		<ThermalZone>
+			<Type>cpu</Type>
+			<TripPoints>
+				<TripPoint>
+					<SensorType>x86_pkg_temp</SensorType>
+					<Temperature>65000</Temperature>
+					<type>passive</type>
+					<ControlType>SEQUENTIAL</ControlType>
+					<CoolingDevice>
+						<index>1</index>
+						<type>rapl_controller</type>
+						<influence>100</influence>
+						<SamplingPeriod>10</SamplingPeriod>
+					</CoolingDevice>
+				</TripPoint>
+			</TripPoints>
+		</ThermalZone>
+	</ThermalZones>
+</Platform>
+</ThermalConfiguration>
diff --git a/contrib/thermald/surface_pro_7/thermal-cpu-cdev-order.xml b/contrib/thermald/surface_pro_7/thermal-cpu-cdev-order.xml
new file mode 100644
index 000000000..e690c5a26
--- /dev/null
+++ b/contrib/thermald/surface_pro_7/thermal-cpu-cdev-order.xml
@@ -0,0 +1,18 @@
+
+<!--
+Specifies the order of compensation to cool CPU only.
+There is a default already implemented in the code, but
+this file can be used to change order
+
+The Following cooling device can present
+-->
+
+<CoolingDeviceOrder>
+	<!-- Specify Cooling device order -->
+	<CoolingDevice>rapl_controller</CoolingDevice>
+	<CoolingDevice>intel_pstate</CoolingDevice>
+	<CoolingDevice>intel_powerclamp</CoolingDevice>
+	<CoolingDevice>cpufreq</CoolingDevice>
+	<CoolingDevice>Processor</CoolingDevice>
+</CoolingDeviceOrder>
+