diff -Nru dkms-2.2.0.3/debian/changelog dkms-2.2.0.3/debian/changelog
--- dkms-2.2.0.3/debian/changelog	2019-05-17 11:21:05.000000000 +0000
+++ dkms-2.2.0.3/debian/changelog	2019-07-26 15:24:31.000000000 +0000
@@ -1,3 +1,11 @@
+dkms (2.2.0.3-2ubuntu11.8) xenial; urgency=medium
+
+  * d/p/fix-kernelsource-check.patch: Take --kernelsourcedir into account
+    when checking for headers (from 2.2.0.3-5 "Do not ignore
+    --kernelsourcedir") (LP: #1838045).
+
+ -- Stefan Bader <stefan.bader@canonical.com>  Fri, 26 Jul 2019 10:16:28 +0200
+
 dkms (2.2.0.3-2ubuntu11.7) xenial; urgency=medium
 
   * Do not invoke dkms_autoinstaller from /etc/kernel/header_postinst.d/dkms
diff -Nru dkms-2.2.0.3/debian/files dkms-2.2.0.3/debian/files
--- dkms-2.2.0.3/debian/files	1970-01-01 00:00:00.000000000 +0000
+++ dkms-2.2.0.3/debian/files	2019-07-26 15:24:43.000000000 +0000
@@ -0,0 +1 @@
+dkms_2.2.0.3-2ubuntu11.8_source.buildinfo kernel optional
diff -Nru dkms-2.2.0.3/debian/patches/fix-kernelsource-check.patch dkms-2.2.0.3/debian/patches/fix-kernelsource-check.patch
--- dkms-2.2.0.3/debian/patches/fix-kernelsource-check.patch	1970-01-01 00:00:00.000000000 +0000
+++ dkms-2.2.0.3/debian/patches/fix-kernelsource-check.patch	2019-07-26 08:15:04.000000000 +0000
@@ -0,0 +1,21 @@
+Description: Use provided path when checking kernel headers
+ When getting the kernel source directory (headers), the check does not take into account
+ if a non-standard location was provided via the command-line.
+ Fix this by picking a line from a more recent version of DKMS.
+Forwarded: not-needed
+Last-Update: 2019-07-26
+
+Index: dkms-2.2.0.3/dkms
+===================================================================
+--- dkms-2.2.0.3.orig/dkms
++++ dkms-2.2.0.3/dkms
+@@ -48,6 +48,9 @@ _get_kernel_dir() {
+        Linux)          DIR="/lib/modules/$KVER/build" ;;
+        GNU/kFreeBSD)   DIR="/usr/src/kfreebsd-headers-$KVER/sys" ;;
+     esac
++
++    [ ! -z "$ksourcedir_fromcli" ] && DIR=$kernel_source_dir
++
+     echo $DIR
+ }
+ 
diff -Nru dkms-2.2.0.3/debian/patches/series dkms-2.2.0.3/debian/patches/series
--- dkms-2.2.0.3/debian/patches/series	2019-05-17 11:20:57.000000000 +0000
+++ dkms-2.2.0.3/debian/patches/series	2019-07-26 08:04:49.000000000 +0000
@@ -16,3 +16,4 @@
 apport_name_in_valueerror.diff
 0014-remove-initrd-backup.patch
 lp-1827697.patch
+fix-kernelsource-check.patch