diff -Nru dahdi-linux-2.11.1~dfsg/debian/changelog dahdi-linux-2.11.1~dfsg/debian/changelog
--- dahdi-linux-2.11.1~dfsg/debian/changelog	2019-05-10 22:27:49.000000000 +0000
+++ dahdi-linux-2.11.1~dfsg/debian/changelog	2019-11-11 12:43:16.000000000 +0000
@@ -1,3 +1,10 @@
+dahdi-linux (1:2.11.1~dfsg-1ubuntu4.2) bionic; urgency=medium
+
+  * Linux 5.4 compatibility (LP: #1848584)
+    - debian/patches/kernel-compat-5.4.patch
+
+ -- Paolo Pisati <paolo.pisati@canonical.com>  Mon, 11 Nov 2019 12:43:16 +0000
+
 dahdi-linux (1:2.11.1~dfsg-1ubuntu4.1) bionic; urgency=medium
 
   * Fix build for Linux kernel 5.0 (LP: #1813058)
diff -Nru dahdi-linux-2.11.1~dfsg/debian/patches/kernel-compat-5.4.patch dahdi-linux-2.11.1~dfsg/debian/patches/kernel-compat-5.4.patch
--- dahdi-linux-2.11.1~dfsg/debian/patches/kernel-compat-5.4.patch	1970-01-01 00:00:00.000000000 +0000
+++ dahdi-linux-2.11.1~dfsg/debian/patches/kernel-compat-5.4.patch	2019-11-11 12:43:16.000000000 +0000
@@ -0,0 +1,29 @@
+Description: Fix FTBFS for kernel 5.4
+Author: Paolo Pisati <paolo.pisati@canonical.com>
+--- a/Makefile
++++ b/Makefile
+@@ -53,7 +53,7 @@
+ 
+ DAHDI_BUILD_ALL:=m
+ 
+-KMAKE=+$(MAKE) -C $(KSRC) SUBDIRS=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
++KMAKE=+$(MAKE) -C $(KSRC) M=$(PWD)/drivers/dahdi DAHDI_INCLUDE=$(PWD)/include DAHDI_MODULES_EXTRA="$(DAHDI_MODULES_EXTRA)" HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
+ 
+ ROOT_PREFIX:=
+ 
+--- a/include/dahdi/kernel.h
++++ b/include/dahdi/kernel.h
+@@ -68,9 +68,13 @@
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
+ #ifdef CONFIG_PCI
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
++#include <linux/pci.h>
++#else
+ #include <linux/pci-aspm.h>
+ #endif
+ #endif
++#endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+ #define HAVE_NET_DEVICE_OPS
diff -Nru dahdi-linux-2.11.1~dfsg/debian/patches/series dahdi-linux-2.11.1~dfsg/debian/patches/series
--- dahdi-linux-2.11.1~dfsg/debian/patches/series	2019-05-10 22:27:49.000000000 +0000
+++ dahdi-linux-2.11.1~dfsg/debian/patches/series	2019-11-11 12:43:16.000000000 +0000
@@ -14,3 +14,4 @@
 kernel-compat-4.15_0001-xpp-move-command_timer-functions-to-xbus-core.patch
 kernel-compat-4.15_0002-fix-building-with-4.15-init_timer-setup_timer.patch
 kernel-compat-5.0.patch
+kernel-compat-5.4.patch