diff -pruN 1.60-8/debian/changelog 1.60-8ubuntu2/debian/changelog
--- 1.60-8/debian/changelog	2019-01-26 08:28:54.000000000 +0000
+++ 1.60-8ubuntu2/debian/changelog	2019-11-12 15:43:03.000000000 +0000
@@ -1,3 +1,15 @@
+ndiswrapper (1.60-8ubuntu2) focal; urgency=medium
+
+  * Add support for kernel 5.4 (LP: #1848588)
+
+ -- Paolo Pisati <paolo.pisati@canonical.com>  Tue, 12 Nov 2019 15:43:03 +0000
+
+ndiswrapper (1.60-8ubuntu1) eoan; urgency=medium
+
+  * Add support for kernel 5.3 (LP: #1837889)
+
+ -- Seth Forshee <seth.forshee@canonical.com>  Mon, 29 Jul 2019 16:06:02 -0400
+
 ndiswrapper (1.60-8) unstable; urgency=medium
 
   * debian/rules: Pass --sort=name to tar for reproducible build
diff -pruN 1.60-8/debian/control 1.60-8ubuntu2/debian/control
--- 1.60-8/debian/control	2019-01-26 08:28:54.000000000 +0000
+++ 1.60-8ubuntu2/debian/control	2019-07-29 20:06:02.000000000 +0000
@@ -1,7 +1,8 @@
 Source: ndiswrapper
 Section: misc
 Priority: optional
-Maintainer: Julian Andres Klode <jak@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Julian Andres Klode <jak@debian.org>
 Standards-Version: 4.3.0
 Build-Depends: debhelper (>= 9), bzip2, dkms
 Vcs-Git: https://salsa.debian.org/jak/ndiswrapper.git
diff -pruN 1.60-8/debian/patches/0010-Build-fixes-for-Linux-5.3.patch 1.60-8ubuntu2/debian/patches/0010-Build-fixes-for-Linux-5.3.patch
--- 1.60-8/debian/patches/0010-Build-fixes-for-Linux-5.3.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.60-8ubuntu2/debian/patches/0010-Build-fixes-for-Linux-5.3.patch	2019-07-29 20:06:02.000000000 +0000
@@ -0,0 +1,16 @@
+Index: ndiswrapper-1.60/driver/ntoskernel.h
+===================================================================
+--- ndiswrapper-1.60.orig/driver/ntoskernel.h
++++ ndiswrapper-1.60/driver/ntoskernel.h
+@@ -109,7 +109,11 @@ static cpumask_t cpumasks[NR_CPUS];
+ #endif /* CONFIG_SMP */
+ 
+ #ifndef tsk_cpus_allowed
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
+ #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
++#else
++#define tsk_cpus_allowed(tsk) ((tsk)->cpus_ptr)
++#endif
+ #endif
+ 
+ #ifndef __packed
diff -pruN 1.60-8/debian/patches/0011-Build-fixes-for-Linux-5.4.patch 1.60-8ubuntu2/debian/patches/0011-Build-fixes-for-Linux-5.4.patch
--- 1.60-8/debian/patches/0011-Build-fixes-for-Linux-5.4.patch	1970-01-01 00:00:00.000000000 +0000
+++ 1.60-8ubuntu2/debian/patches/0011-Build-fixes-for-Linux-5.4.patch	2019-11-12 15:43:03.000000000 +0000
@@ -0,0 +1,25 @@
+Description: Fix FTBFS with kernel 5.4
+Author: Paolo Pisati <paolo.pisati@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1848588
+
+--- a/driver/wrapndis.c
++++ b/driver/wrapndis.c
+@@ -457,10 +457,18 @@
+ 	for (i = 0; i < skb_shinfo(skb)->nr_frags; i++) {
+ 		skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
+ 		sg_element++;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+ 		sg_element->length = frag->size;
++#else
++		sg_element->length = skb_frag_size(frag);
++#endif
+ 		sg_element->address =
+ 			pci_map_page(wnd->wd->pci.pdev, skb_frag_page(frag),
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
+ 				     frag->page_offset, frag->size,
++#else
++				     skb_frag_off(frag), skb_frag_size(frag),
++#endif
+ 				     PCI_DMA_TODEVICE);
+ 		TRACE3("%llx, %u", sg_element->address, sg_element->length);
+ 	}
diff -pruN 1.60-8/debian/patches/series 1.60-8ubuntu2/debian/patches/series
--- 1.60-8/debian/patches/series	2019-01-26 08:28:54.000000000 +0000
+++ 1.60-8ubuntu2/debian/patches/series	2019-11-12 15:43:03.000000000 +0000
@@ -7,3 +7,5 @@ Hardcode-etc-modprobe.d-ndiswrapper.conf
 0007-Build-fixes-for-Linux-4.13.patch
 0008-Build-fixes-for-Linux-4.15.patch
 0009-kernel-5.0-Replace-do_gettimeofday-with-ktime_get_re.patch
+0010-Build-fixes-for-Linux-5.3.patch
+0011-Build-fixes-for-Linux-5.4.patch
