diff --git a/README.md b/README.md
index 5b3df266e..50001939b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Linux Surface
 
-Linux running on the Surface Book, Surface Book 2, Surface Go, Surface Pro 3, Surface Pro 4, Surface Pro 2017 and Surface Laptop. Follow the instructions below to install the latest kernel and config files.
+Linux running on the Surface Book, Surface Book 2, Surface Go, Surface Pro 3, Surface Pro 4, Surface Pro 2017, Surface Pro 6, Surface Laptop and Surface Laptop 2. Follow the instructions below to install the latest kernel and config files.
 
 ### What's Working
 
diff --git a/setup.sh b/setup.sh
index 879276419..378f7322a 100644
--- a/setup.sh
+++ b/setup.sh
@@ -97,6 +97,16 @@ if [ "$SUR_MODEL" = "Surface Pro 2017" ]; then
 	unzip -o firmware/i915_firmware_kbl.zip -d /lib/firmware/i915/
 fi
 
+if [ "$SUR_MODEL" = "Surface Pro 6" ]; then
+	echo "\nInstalling IPTS firmware for Surface Pro 6...\n"
+	mkdir -p /lib/firmware/intel/ipts
+	unzip -o firmware/ipts_firmware_v102.zip -d /lib/firmware/intel/ipts/
+
+	echo "\nInstalling i915 firmware for Surface Pro 6...\n"
+	mkdir -p /lib/firmware/i915
+	unzip -o firmware/i915_firmware_kbl.zip -d /lib/firmware/i915/
+fi
+
 if [ "$SUR_MODEL" = "Surface Laptop" ]; then
 	echo "\nInstalling IPTS firmware for Surface Laptop...\n"
 	mkdir -p /lib/firmware/intel/ipts