diff -Nru wireguard-linux-compat-1.0.20201112/debian/changelog wireguard-linux-compat-1.0.20201112/debian/changelog
--- wireguard-linux-compat-1.0.20201112/debian/changelog	2020-11-23 17:29:58.000000000 -0300
+++ wireguard-linux-compat-1.0.20201112/debian/changelog	2021-02-10 15:42:00.000000000 -0300
@@ -1,3 +1,9 @@
+wireguard-linux-compat (1.0.20201112-1~18.04.2) bionic; urgency=medium
+
+  * Add compatibility for kernels with skb_mark_not_on_list. (LP: #1915304)
+
+ -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com>  Wed, 10 Feb 2021 15:42:00 -0300
+
 wireguard-linux-compat (1.0.20201112-1~18.04.1) bionic; urgency=medium
 
   * Backport latest upstream packages to bionic (LP: #1905325).
diff -Nru wireguard-linux-compat-1.0.20201112/debian/configure_features.sh wireguard-linux-compat-1.0.20201112/debian/configure_features.sh
--- wireguard-linux-compat-1.0.20201112/debian/configure_features.sh	1969-12-31 21:00:00.000000000 -0300
+++ wireguard-linux-compat-1.0.20201112/debian/configure_features.sh	2021-02-10 15:42:00.000000000 -0300
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+echo > "$1"
+
+srctree="/lib/modules/$kernelver/build"
+if grep -q skb_mark_not_on_list $srctree/include/linux/skbuff.h
+then
+	echo '#define SKB_MARK_NOT_ON_LIST' >> "$1"
+fi
diff -Nru wireguard-linux-compat-1.0.20201112/debian/patches/99_use_config_h_for_features_detection.patch wireguard-linux-compat-1.0.20201112/debian/patches/99_use_config_h_for_features_detection.patch
--- wireguard-linux-compat-1.0.20201112/debian/patches/99_use_config_h_for_features_detection.patch	1969-12-31 21:00:00.000000000 -0300
+++ wireguard-linux-compat-1.0.20201112/debian/patches/99_use_config_h_for_features_detection.patch	2021-02-10 15:42:00.000000000 -0300
@@ -0,0 +1,33 @@
+Index: wireguard-linux-compat-1.0.20201112/src/compat/compat.h
+===================================================================
+--- wireguard-linux-compat-1.0.20201112.orig/src/compat/compat.h
++++ wireguard-linux-compat-1.0.20201112/src/compat/compat.h
+@@ -6,6 +6,7 @@
+ #ifndef _WG_COMPAT_H
+ #define _WG_COMPAT_H
+ 
++#include "config.h"
+ #include <linux/kconfig.h>
+ #include <linux/version.h>
+ #include <linux/types.h>
+@@ -826,7 +827,7 @@ static __always_inline void old_rcu_barr
+ #define COMPAT_CANNOT_DEPRECIATE_BH_RCU
+ #endif
+ 
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8)
++#ifndef SKB_MARK_NOT_ON_LIST
+ static inline void skb_mark_not_on_list(struct sk_buff *skb)
+ {
+ 	skb->next = NULL;
+Index: wireguard-linux-compat-1.0.20201112/src/Kbuild
+===================================================================
+--- wireguard-linux-compat-1.0.20201112.orig/src/Kbuild
++++ wireguard-linux-compat-1.0.20201112/src/Kbuild
+@@ -14,3 +14,7 @@ include $(src)/crypto/Kbuild.include
+ include $(src)/compat/Kbuild.include
+ 
+ obj-$(if $(KBUILD_EXTMOD),m,$(CONFIG_WIREGUARD)) := wireguard.o
++
++$(addprefix $(obj)/,$(wireguard-y)): $(obj)/compat/config.h
++$(obj)/compat/config.h: $(src)/configure_features.sh
++	kernelver=$(KERNELRELEASE) $(src)/configure_features.sh $(obj)/compat/config.h
diff -Nru wireguard-linux-compat-1.0.20201112/debian/patches/series wireguard-linux-compat-1.0.20201112/debian/patches/series
--- wireguard-linux-compat-1.0.20201112/debian/patches/series	2020-11-23 17:29:58.000000000 -0300
+++ wireguard-linux-compat-1.0.20201112/debian/patches/series	2021-02-10 15:40:56.000000000 -0300
@@ -1,2 +1,3 @@
 0001-Makefile-do-not-use-git-to-get-version-number.patch
 0002-Avoid-trying-to-compile-on-debian-5.5-kernels-Closes.patch
+99_use_config_h_for_features_detection.patch
diff -Nru wireguard-linux-compat-1.0.20201112/debian/rules wireguard-linux-compat-1.0.20201112/debian/rules
--- wireguard-linux-compat-1.0.20201112/debian/rules	2020-07-29 19:54:45.000000000 -0300
+++ wireguard-linux-compat-1.0.20201112/debian/rules	2021-02-10 15:37:05.000000000 -0300
@@ -12,6 +12,10 @@
 
 override_dh_auto_install-indep:
 	$(MAKE) -C src DESTDIR=../debian/wireguard-dkms DKMSDIR=/usr/src/wireguard-$(DEB_VERSION_UPSTREAM) dkms-install
+	# Copy prebuild script
+	install -m 755 debian/configure_features.sh \
+		debian/wireguard-dkms/usr/src/wireguard-$(DEB_VERSION_UPSTREAM)/
+
 
 override_dh_dkms:
 	dh_dkms -p wireguard-dkms -- src/dkms.conf