diff --git a/Manifests/Manifest_LAOS-17.1.xml b/Manifests/Manifest_LAOS-17.1.xml
index 16a31d27..3ac9afde 100644
--- a/Manifests/Manifest_LAOS-17.1.xml
+++ b/Manifests/Manifest_LAOS-17.1.xml
@@ -142,6 +142,12 @@
 	<project path="device/cyanogen/msm8916-common" name="LineageOS/android_device_cyanogen_msm8916-common" remote="github" />
 	<project path="kernel/cyanogen/msm8916" name="LineageOS/android_kernel_cyanogen_msm8916" remote="github" />
 
+	<!-- Xiaomi Redmi K20 / Mi 9T (davinci) -->
+	<project path="hardware/xiaomi" name="LineageOS/android_hardware_xiaomi" remote="github" />
+	<project path="device/xiaomi/davinci" name="LineageOS/android_device_xiaomi_davinci" remote="github" />
+	<project path="device/xiaomi/sm6150-common" name="LineageOS/android_device_xiaomi_sm6150-common" remote="github" />
+	<project path="kernel/xiaomi/sm6150" name="LineageOS/android_kernel_xiaomi_sm6150" remote="github" />
+
 	<!-- Yandex Phone (Amber) -->
 	<project path="device/yandex/Amber" name="LineageOS/android_device_yandex_Amber" remote="github" />
 	<project path="kernel/yandex/sdm660" name="LineageOS/android_kernel_yandex_sdm660" remote="github" />
@@ -151,10 +157,4 @@
 	<project path="device/zuk/msm8996-common" name="LineageOS/android_device_zuk_msm8996-common" remote="github" />
 	<project path="kernel/zuk/msm8996" name="LineageOS/android_kernel_zuk_msm8996" remote="github" />
 
-	<!-- Xiaomi Redmi K20 / Mi 9T (davinci) -->
-	<project path="hardware/xiaomi" name="LineageOS/android_hardware_xiaomi" remote="github" />
-	<project path="device/xiaomi/davinci" name="LineageOS/android_device_xiaomi_davinci" remote="github" />
-	<project path="device/xiaomi/sm6150-common" name="LineageOS/android_device_xiaomi_sm6150-common" remote="github" />
-	<project path="kernel/xiaomi/sm6150" name="LineageOS/android_kernel_xiaomi_sm6150" remote="github" />
-
 </manifest>
diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml
index 01e62c47..ccfd6cef 100644
--- a/Manifests/Manifest_LAOS-18.1.xml
+++ b/Manifests/Manifest_LAOS-18.1.xml
@@ -272,4 +272,9 @@
 	<project path="device/xiaomi/vayu" name="LineageOS/android_device_xiaomi_vayu" remote="github" />
 	<!-- uses xiaomi sm8150 commons -->
 
+	<!-- Zuk Z2 Plus (z2_plus) -->
+	<project path="device/zuk/z2_plus" name="LineageOS/android_device_zuk_z2_plus" remote="github" />
+	<project path="device/zuk/msm8996-common" name="LineageOS/android_device_zuk_msm8996-common" remote="github" />
+	<project path="kernel/zuk/msm8996" name="LineageOS/android_kernel_zuk_msm8996" remote="github" />
+
 </manifest>
diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
new file mode 100644
index 00000000..d9292378
--- /dev/null
+++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh
@@ -0,0 +1,285 @@
+#!/bin/bash
+cd "$DOS_BUILD_BASE""kernel/zuk/msm8996"
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0233-0234.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.patch --exclude=Makefile
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0013.patch
+#git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch
+git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-0571/qcacld-2.0/0004.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-0571/qcacld-2.0/0006.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-0571/qcacld-2.0/0007.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-0571/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-1583/^4.6.3/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9059/^4.11.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/^4.11.2/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/4.4/0019.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-21008/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12614/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14615/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14763/^4.16.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14895/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14896/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14901/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15217/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15220/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15221/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16232/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16233/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16234/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-17351/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19056/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19057/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19062/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19063/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19066/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19227/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.4/0005.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0017.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0018.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0019.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19319/4.4/0020.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19332/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19447/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19965/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/^4.14/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0432/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0021.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0022.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0023.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0024.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0025.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3699/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0026.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0027.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0028.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0029.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0030.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0019.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0020.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8648/4.4/0021.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10942/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11116/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11131/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11494/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11565/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11609/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11668/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12652/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12653/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12654/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12826/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14381/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14416/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25673/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26146/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26558/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0014.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0015.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29370/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0017.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35519/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0046.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0047.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0048.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0049.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0050.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0051.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0052.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0053.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0054.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.4/0055.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0016.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0017.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0018.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0019.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0020.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.4/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.4/0005.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch
+editKernelLocalversion "-dos.p281"
+cd "$DOS_BUILD_BASE"
diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh
index 57dbfa68..b46b2a43 100644
--- a/Scripts/LineageOS-18.1/Functions.sh
+++ b/Scripts/LineageOS-18.1/Functions.sh
@@ -19,7 +19,7 @@ umask 0022;
 #Last verified: 2021-10-16
 
 patchAllKernels() {
-	startPatcher "kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_redbull kernel_google_sunfish kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_jf kernel_samsung_msm8930-common kernel_samsung_msm8974 kernel_xiaomi_sdm845 kernel_xiaomi_sm8150 kernel_xiaomi_sm8250";
+	startPatcher "kernel_essential_msm8998 kernel_fairphone_msm8974 kernel_fairphone_sdm632 kernel_fxtec_msm8998 kernel_google_coral kernel_google_msm kernel_google_msm-4.9 kernel_google_redbull kernel_google_sunfish kernel_google_wahoo kernel_htc_msm8974 kernel_lge_g3 kernel_lge_mako kernel_lge_msm8974 kernel_lge_msm8996 kernel_moto_shamu kernel_motorola_msm8974 kernel_nextbit_msm8992 kernel_oneplus_msm8996 kernel_oneplus_msm8998 kernel_oneplus_sdm845 kernel_oneplus_sm8150 kernel_oppo_msm8974 kernel_razer_msm8998 kernel_razer_sdm845 kernel_samsung_jf kernel_samsung_msm8930-common kernel_samsung_msm8974 kernel_xiaomi_sdm845 kernel_xiaomi_sm8150 kernel_xiaomi_sm8250 kernel_zuk_msm8996";
 }
 export -f patchAllKernels;
 
@@ -83,6 +83,7 @@ buildAll() {
 	buildDevice h990;
 	buildDevice us996;
 	buildDevice oneplus3 verity; #needs manual patching - broken yyloc
+	buildDevice z2_plus verity;
 	#SD835
 	buildDevice cheryl verity;
 	buildDevice cheeseburger verity;
diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh
index 76f0db3d..3f7956a2 100644
--- a/Scripts/LineageOS-18.1/Patch.sh
+++ b/Scripts/LineageOS-18.1/Patch.sh
@@ -433,6 +433,10 @@ if enterAndClear "device/xiaomi/sm8250-common"; then
 enableVerity; #Resurrect dm-verity
 fi;
 
+if enterAndClear "device/zuk/msm8996-common"; then
+awk -i inplace '!/WfdCommon/' msm8996.mk; #fix breakage
+fi;
+
 if enterAndClear "kernel/google/wahoo"; then
 sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
 fi;