diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 40afcafd..64fc07b0 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -98,6 +98,12 @@
 	<project path="device/google/sargo" name="LineageOS/android_device_google_sargo" remote="github" />
 	<project path="kernel/google/msm-4.9" name="LineageOS/android_kernel_google_msm-4.9" remote="github" />
 
+	<!-- HTC One (m8) -->
+	<project path="device/htc/m8" name="LineageOS/android_device_htc_m8" remote="github" />
+	<project path="device/htc/m8-common" name="LineageOS/android_device_htc_m8-common" remote="github" />
+	<project path="device/htc/msm8974-common" name="LineageOS/android_device_htc_msm8974-common" remote="github" />
+	<project path="kernel/htc/msm8974" name="LineageOS/android_kernel_htc_msm8974" remote="github" />
+
 	<!-- Moto G 3rd Gen (osprey)
 	<project path="device/motorola/msm8916-common" name="LineageOS/android_device_motorola_msm8916-common" remote="github" />
 	<project path="device/motorola/osprey" name="LineageOS/android_device_motorola_osprey" remote="github" />
diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh
new file mode 100644
index 00000000..c5104d22
--- /dev/null
+++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh
@@ -0,0 +1,275 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/htc/msm8974"
+git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0005-AndroidHardening-Deny_USB/3.4/3.4-Backport.patch
+git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/0090-Unknown/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3076/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3222/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3225/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3227/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3228/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3229/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-3231/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4470/^3.12/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-3688/^3.17.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7842/^3.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-7975/^3.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9781/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-2042/^3.19/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7566/^4.4.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8553/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2443/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4485/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4580/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-4913/^4.5.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5244/^4.6.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5828/^4.6.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6480/^4.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-7117/^4.5.2/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8404/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10318/^4.7.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0452/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0786/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0861/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/^4.10.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8266/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/^4.14.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/^4.11.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11039/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/^4.11.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/^4.12.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/^4.13.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12762/^4.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/^4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13215/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13216/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13245/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13246/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13305/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13695/^4.12.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14106/^4.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14489/^4.13.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15115/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15649/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15850/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.4/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/^4.13.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16529/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16531/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16533/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16534/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16535/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16537/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16939/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/^4.14.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17558/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17769/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17770/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/^4.14.8/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17806/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17807/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/^4.12.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18203/^4.14.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/^4.11.3/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000363/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1068/^4.16/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1092/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3561/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3563/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3564/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3584/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3586/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5332/^4.14.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5333/^4.14.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5344/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5750/^4.14.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5803/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5858/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5896/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-6927/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7492/^4.14.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7566/^4.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7755/^4.15.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7757/^4.15.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8781/^4.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9389/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9416/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9422/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9439/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9517/3.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9568/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10021/^4.16/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10087/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10124/^4.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10876/3.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10877/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12011/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13900/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13919/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14614/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18710/^4.19/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19985/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20169/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20511/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000199/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000204/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-5489/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9454/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9456/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/^5.0.17/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10491/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10497/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10527/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10607/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10626/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10638/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11477/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11478/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11479/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14037/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14821/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15117/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15118/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15214/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15216/^5.0.14/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15239/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15505/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15807/^5.1.13/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15926/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16746/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17052/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17133/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18806/^5.3.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19524/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19527/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19528/^5.3.7/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19532/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19537/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20054/^5.0.6/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/^5.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8647/3.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/3.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10773/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11267/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11267/ANY/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/^5.6.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/^5.6.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/^5.7.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/^5.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/^5.7.6/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/^5.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
+editKernelLocalversion "-dos.p271"
+cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh
index 6e4b34db..a4af9b53 100644
--- a/Scripts/LineageOS-17.1/Functions.sh
+++ b/Scripts/LineageOS-17.1/Functions.sh
@@ -18,7 +18,7 @@
 #Last verified: 2020-04-14
 
 patchAllKernels() {
-	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
+	startPatcher "kernel_asus_fugu kernel_cyanogen_msm8916 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_google_marlin kernel_google_msm-4.9 kernel_google_yellowstone kernel_htc_msm8974 kernel_lge_mako kernel_motorola_msm8916 kernel_motorola_msm8992 kernel_motorola_msm8996 kernel_oneplus_msm8994 kernel_oneplus_sm7250 kernel_oneplus_sm8150 kernel_yandex_sdm660 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -59,6 +59,7 @@ buildAll() {
 	#buildDevice osprey; #needs manual patching + more - mkdir proprietary/priv-app && cp -r proprietary/system/priv-app/qcrilmsgtunnel proprietary/priv-app/
 	#SD801
 	buildDevice FP2;
+	buildDevice m8; #18.1 has issues
 	#SD808
 	buildDevice clark;
 	#SD810
@@ -115,7 +116,7 @@ enableDexPreOpt() {
 	if [ -f BoardConfig.mk ]; then
 		echo "WITH_DEXPREOPT := true" >> BoardConfig.mk;
 		echo "WITH_DEXPREOPT_DEBUG_INFO := false" >> BoardConfig.mk;
-		if true; then
+		if [ "$1" != "device/htc/m8" ]; then
 			echo "WITH_DEXPREOPT_BOOT_IMG_AND_SYSTEM_SERVER_ONLY := false" >> BoardConfig.mk;
 			echo "Enabled full dexpreopt for $1";
 		else
diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh
index 2ecfe9fe..21e8ba21 100644
--- a/Scripts/LineageOS-17.1/Patch.sh
+++ b/Scripts/LineageOS-17.1/Patch.sh
@@ -246,6 +246,9 @@ awk -i inplace '!/INODE_COUNT/' BoardConfig-lineage.mk; #mke2fs -1 incompatibili
 enterAndClear "device/google/marlin";
 git revert --no-edit 777dafa35f185b1f501e3c80b8ab495191583444; #remove some carrier blobs
 
+enterAndClear "device/htc/m8-common";
+awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #broken releasetools
+
 enterAndClear "device/lge/mako";
 echo "pmf=0" >> wifi/wpa_supplicant_overlay.conf; #Wi-Fi chipset doesn't support PMF
 awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfig.mk; #broken releasetools