diff --git a/dkms-2.8.3-kernel-5.4.patch b/dkms-2.8.3-kernel-5.4.patch
new file mode 100644
index 0000000..b84adf1
--- /dev/null
+++ b/dkms-2.8.3-kernel-5.4.patch
@@ -0,0 +1,12 @@
+diff -Nru dkms-2.8.3.orig/dkms dkms-2.8.3/dkms
+--- dkms-2.8.3.orig/dkms	2020-07-17 03:57:34.000000000 +0200
++++ dkms-2.8.3/dkms	2020-07-24 10:23:30.880000000 +0200
+@@ -702,6 +702,8 @@
+         [[ ! $make_command ]] && make_command="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build modules"
+         [[ ! $clean ]] && clean="make -C $kernel_source_dir SUBDIRS=$dkms_tree/$module/$module_version/build clean"
+     else
++        make_command="${make_command/SUBDIRS=/M=}"
++        clean="${clean/SUBDIRS=/M=}"
+         [[ ! $make_command ]] && make_command="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build"
+         [[ ! $clean ]] && clean="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build clean"
+     fi
diff --git a/dkms.spec b/dkms.spec
index 97cefa2..48a3306 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -1,6 +1,6 @@
 Name:          dkms
 Version:       2.8.3
-Release:       1mamba
+Release:       2mamba
 Summary:       Dynamic Kernel Module Support
 Group:         System/Tools
 Vendor:        openmamba
@@ -11,6 +11,7 @@ Source:        https://github.com/dell/dkms.git/v%{version}/dkms-%{version}.tar.
 Source1:       dkms.service
 Source2:       dkms.systemd
 Patch0:        dkms-2.4.0-dont_fail_if_module_source_removed.patch
+Patch1:        dkms-2.8.3-kernel-5.4.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
@@ -24,6 +25,7 @@ DKMS stands for Dynamic Kernel Module Support. It is designed to create a framew
 %prep
 %setup -q
 #%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -94,6 +96,9 @@ find /var/lib/dkms -xtype l -exec rm -f {} \;
 #README.dkms TODO
 
 %changelog
+* Fri Jul 24 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 2.8.3-2mamba
+- patched to automatically fix dkms.conf containing SUBDIRS by replacing with M as required since kernel 5.4
+
 * Fri Jul 17 2020 Automatic Build System <autodist@mambasoft.it> 2.8.3-1mamba
 - automatic version update by autodist