diff --git a/.gitignore b/.gitignore
index 95a0598..8c696ee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/mvsas-4.18.tar.xz
+SOURCES/mvsas-4.18.0-80.el8.tar.xz
diff --git a/.kmod-mvsas.metadata b/.kmod-mvsas.metadata
index a5e2ab9..660edcf 100644
--- a/.kmod-mvsas.metadata
+++ b/.kmod-mvsas.metadata
@@ -1 +1 @@
-ec8804836ef6162beb9eb8116692c75748166df6 SOURCES/mvsas-4.18.tar.xz
+a5368d56ca129339ff92498dda1c3abbfb91a7c6 SOURCES/mvsas-4.18.0-80.el8.tar.xz
diff --git a/SOURCES/9999-enable-mvsas.patch b/SOURCES/9999-enable-mvsas.patch
new file mode 100644
index 0000000..699cce9
--- /dev/null
+++ b/SOURCES/9999-enable-mvsas.patch
@@ -0,0 +1,7 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -27 +27 @@
+-obj-$(CONFIG_SCSI_MVSAS) += mvsas.o
++obj-m += mvsas.o
+@@ -31,0 +32 @@
++ccflags-y += -DCONFIG_SCSI_MVSAS_TASKLET
diff --git a/SPECS/kmod-mvsas.spec b/SPECS/kmod-mvsas.spec
index 6037998..9d685b8 100644
--- a/SPECS/kmod-mvsas.spec
+++ b/SPECS/kmod-mvsas.spec
@@ -1,6 +1,8 @@
 %global pkg mvsas
 
-%global kernel_version 4.18.0-358.el8
+%global driver_version 4.18.0-80.el8
+
+%global kernel_version 4.18.0-348.el8
 
 %global _use_internal_dependency_generator 0
 %global __find_requires /usr/lib/rpm/redhat/find-requires
@@ -18,14 +20,15 @@
 
 
 Name:             kmod-%{pkg}
-Version:          4.18
-Release:          8%{?dist}
+Version:          4.18.0.80
+Release:          1%{?dist}
 Summary:          Marvell 88SE64XX/88SE94XX SAS/SATA Controller (%{pkg}) driver
 
 License:          GPLv2
 URL:              https://www.kernel.org/
 
-Source0:          %{pkg}-%{version}.tar.xz
+Source0:          %{pkg}-%{driver_version}.tar.xz
+Patch9999:        9999-enable-mvsas.patch
 
 ExclusiveArch:    x86_64 aarch64
 
@@ -62,7 +65,7 @@ chip based PCI-E host adapters.
 
 
 %prep
-%autosetup -p1 -n %{pkg}-%{version}
+%autosetup -p1 -n %{pkg}-%{driver_version}
 
 
 %build
@@ -127,14 +130,6 @@ fi
 
 
 %changelog
-* Mon Jan 10 2022 Kmods SIG <sig-kmods@centosproject.org> - 4.18-8
-- Rebuild for 4.18.0-358.el8
-
-* Thu Oct 21 2021 Peter Georg <peter.georg@physik.uni-regensburg.de> - 4.18-7
-- Rebuild for 4.18.0-348.el8
-
-* Wed Sep 29 2021 Peter Georg <peter.georg@physik.uni-regensburg.de> - 4.18-6
-- Rebuild for 4.18.0-338.el8
-
-* Tue Sep 28 2021 Peter Georg <peter.georg@physik.uni-regensburg.de> - 4.18-5
-- Convert to kABI tracking kmod package (kernel >= 4.18.0-315.el8)
+* Wed Jan 12 2022 Kmods SIG <sig-kmods@centosproject.org> - 4.18.0.80-1
+- Switch to EL kernel source and versioning
+- kABI tracking kmod package (kernel >= 4.18.0-348.el8)